swisspost#162: added chromedriver to resources and dissabled other tests

roggerj · Sep 6, 2017 · a588446 · a588446
1 parent d8d1b69
commit a588446
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,9 @@ services:
    - redis-server
 script: 
    - ./gradlew build
+#   - ./gradlew gateleen-test:startServer  (also waits for it to come up)
+#   - ./gradlew gateleen-playground:uploapStaticFiles
+#   - ./gradlew gateleen-test:stopServer
    - ./gradlew :gateleen-test:test -PintegrationTests
    - ./gradlew jacocoTestReport
 after_success:

diff --git a/gateleen-test/build.gradle b/gateleen-test/build.gradle
@@ -47,4 +47,8 @@ test {
     onlyIf {
         project.hasProperty("integrationTests")
     }
+    filter {
+        //specific test class, wildcard for packages
+        includeTestsMatching "*.HookJsUITest"
+    }
 }
diff --git a/gateleen-test/src/test/java/org/swisspush/gateleen/hookjs/HookJsUITest.java b/gateleen-test/src/test/java/org/swisspush/gateleen/hookjs/HookJsUITest.java
@@ -26,7 +26,7 @@ public class HookJsUITest extends AbstractTest {
     @Test
     public void testSingleHook() throws InterruptedException {
 
-        System.setProperty("webdriver.chrome.driver", "/home/jonas/work/jrepo-local/tools/chromedriver");
+        System.setProperty("webdriver.chrome.driver", "src/test/resources/chromedriver/chromedriver");
         webDriver = new ChromeDriver();
         webDriver.get("http://localhost:" + MAIN_PORT + ROOT + "/hooktest.html");
 

diff --git a/gateleen-test/src/test/resources/chromedriver/chromedriver b/gateleen-test/src/test/resources/chromedriver/chromedriver