diff --git a/.travis.yml b/.travis.yml index 5513154d8..a8893bf2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ services: before_install: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start -# Because newer versions of Chrome are not supported for the deprecated precise environment we are using, +# Because newer versions of Chrome are not supported for the deprecated "precise" environment of travis we are using, # we download and install an older version of Chrome (v. 48), along with some dependencies. - sudo apt-get install -y libappindicator1 fonts-liberation - wget http://www.slimjet.com/chrome/download-chrome.php?file=lnx%2Fchrome64_48.0.2564.109.deb @@ -18,7 +18,7 @@ before_install: - unzip chromedriver_linux64.zip -d gateleen-test/src/test/resources/ script: - ./gradlew build - - java -jar gateleen-playground/build/libs/playground.jar &> /home/jonas/work/projects/gateleen/playground_logs.log & + - java -jar gateleen-playground/build/libs/playground.jar &> playground_logs.log & # TODO: Instead of sleeping, should we rather make sure that the server Playground actually is running? - sleep 5s - ./gradlew :gateleen-playground:uploadStaticFiles diff --git a/gateleen-test/src/test/java/org/swisspush/gateleen/hookjs/RunCucumberTests.java b/gateleen-test/src/test/java/org/swisspush/gateleen/hookjs/HookJsTest.java similarity index 74% rename from gateleen-test/src/test/java/org/swisspush/gateleen/hookjs/RunCucumberTests.java rename to gateleen-test/src/test/java/org/swisspush/gateleen/hookjs/HookJsTest.java index e1d17f699..72397ae19 100644 --- a/gateleen-test/src/test/java/org/swisspush/gateleen/hookjs/RunCucumberTests.java +++ b/gateleen-test/src/test/java/org/swisspush/gateleen/hookjs/HookJsTest.java @@ -8,9 +8,14 @@ package org.swisspush.gateleen.hookjs; +import cucumber.api.CucumberOptions; import cucumber.api.junit.Cucumber; import org.junit.runner.RunWith; @RunWith(Cucumber.class) -public class RunCucumberTests { +@CucumberOptions( + format = "pretty", + features = "src/test/resources/features/hook-js.feature" +) +public class HookJsTest { } diff --git a/gateleen-test/src/test/resources/org/swisspush/gateleen/hookjs/hook-js-ui-test.feature b/gateleen-test/src/test/resources/features/hook-js.feature similarity index 98% rename from gateleen-test/src/test/resources/org/swisspush/gateleen/hookjs/hook-js-ui-test.feature rename to gateleen-test/src/test/resources/features/hook-js.feature index 2f903c0bf..97efc2ec9 100644 --- a/gateleen-test/src/test/resources/org/swisspush/gateleen/hookjs/hook-js-ui-test.feature +++ b/gateleen-test/src/test/resources/features/hook-js.feature @@ -1,4 +1,4 @@ -Feature: hook-js UI Test +Feature: Hooking for JavaScript clients Background: Given Chrome has been started