From f1b6050de1a2f725c0ce933ebbefd19e7c1f89e4 Mon Sep 17 00:00:00 2001
From: roggerj <jonas.rogger@post.ch>
Date: Mon, 11 Sep 2017 11:25:58 +0700
Subject: [PATCH] #162: cleaned up travis and gradle files

---
 .travis.yml                | 5 +----
 gateleen-test/build.gradle | 8 ++++----
 gradle.properties          | 1 +
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 830d081b4..e2c5adb0e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ dist: precise
 jdk:
   - oraclejdk8
 services:
-   - redis-server
+  - redis-server
 before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
@@ -16,13 +16,10 @@ before_install:
   - cd ..; cd ..; cd ..; cd ..
 script:
    - ./gradlew build
-#   - ./gradlew gateleen-test:startServer  (no logging, also waits for it to come up)
    - nohup java -jar gateleen-playground/build/libs/playground.jar &
    - sleep 5s
-#   - ./gradlew :gateleen-playground:uploadStaticFiles
    - ./gradlew :gateleen-playground:uploadStaticFiles
    - ./gradlew :gateleen-test:test -PuiTests -Dsel_chrome_driver=src/test/resources/chromedriver
-#   - ./gradlew gateleen-test:stopServer
    - kill $(ps -ef | grep playground | awk '{ print $2 }')
    - ./gradlew :gateleen-test:test -PnonUiTests
    - ./gradlew jacocoTestReport
diff --git a/gateleen-test/build.gradle b/gateleen-test/build.gradle
index 374a572e8..d95107b65 100644
--- a/gateleen-test/build.gradle
+++ b/gateleen-test/build.gradle
@@ -40,15 +40,15 @@ dependencies {
         exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations'
         exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
     }
-    compile (group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.+') {
+    testCompile (group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.+') {
         exclude group: 'org.seleniumhq.selenium', module: 'selenium-edge-driver'
         exclude group: 'org.seleniumhq.selenium', module: 'selenium-firefox-driver'
         exclude group: 'org.seleniumhq.selenium', module: 'selenium-ie-driver'
         exclude group: 'org.seleniumhq.selenium', module: 'selenium-opera-driver'
         exclude group: 'org.seleniumhq.selenium', module: 'selenium-safari-driver'
     }
-    testCompile (group: 'info.cukes', name: 'cucumber-java', version: '1.2.5')
-    testCompile (group: 'info.cukes', name: 'cucumber-junit', version: '1.2.5')
+    testCompile (group: 'info.cukes', name: 'cucumber-java', version: "$cukeVersion")
+    testCompile (group: 'info.cukes', name: 'cucumber-junit', version: "$cukeVersion")
 }
 
 test {
@@ -61,8 +61,8 @@ test {
     filter {
 
         if (project.hasProperty("nonUiTests")) {
-            exclude "org/swisspush/gateleen/hookjs/**"
             include "org/swisspush/gateleen/**"
+            exclude "org/swisspush/gateleen/hookjs/**"
         }
 
         if (project.hasProperty("uiTests")) {
diff --git a/gradle.properties b/gradle.properties
index e2165160a..7dbbd8e84 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -35,3 +35,4 @@ mockitoVersion=1.9.5
 wiremockVersion=1.56
 commonscodecVersion=1.9
 angularjsVersion=1.5.8
+cukeVersion=1.2.5