Skip to content

Commit

Permalink
swisspost#162: changed from switch to overwrite chromedriver in source
Browse files Browse the repository at this point in the history
  • Loading branch information
roggerj committed Sep 7, 2017
1 parent 50cebf6 commit 1c8e0e2
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ before_install:
- 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
- sudo dpkg -i download-chrome.php?file=lnx%2Fchrome64_48.0.2564.109.deb
- cd gateleen-test/src/test/resources/
- cd gateleen-test/src/test/resources/chromedriver/
- rm chromedriver
- wget https://chromedriver.storage.googleapis.com/2.21/chromedriver_linux64.zip
- unzip chromedriver_linux64.zip
- cd ..; cd ..; cd ..; cd ..
- cd ..; cd ..; cd ..; cd ..; cd ..
script:
- ./gradlew build
# - ./gradlew gateleen-test:startServer (also waits for it to come up)
Expand Down
12 changes: 6 additions & 6 deletions gateleen-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ dependencies {
}

test {
onlyIf {
project.hasProperty("integrationTests")
}
// filter {
// //specific test class, wildcard for packages
// includeTestsMatching "*.HookJsUITest"
// onlyIf {
// project.hasProperty("integrationTests")
// }
filter {
//specific test class, wildcard for packages
includeTestsMatching "*.HookJsUITest"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ public class HookJsUITest extends AbstractTest {
@BeforeClass
public static void setupChromeDriver() {

if (System.getProperty("webdriver.chrome.driver") == null) {
System.setProperty("webdriver.chrome.driver", "src/test/resources/chromedriver");
}
// if (System.getProperty("webdriver.chrome.driver") == null) {
System.setProperty("webdriver.chrome.driver", "src/test/resources/chromedriver/chromedriver");
// }

webDriver = new ChromeDriver();
}
Expand Down
Binary file not shown.

0 comments on commit 1c8e0e2

Please sign in to comment.