Merge pull request #9059 from pamil/1.0-travis-not-deprecated

Make Travis use the most recent Chromedriver
Sylius · Dec 27, 2017 · ea22c76 · ea22c76
2 parents a3f488c + 17c2008
commit ea22c76
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 dist: trusty
-group: deprecated-2017Q4
 
 env:
     global:

diff --git a/etc/travis/suites/application/script/test-behat-with-javascript b/etc/travis/suites/application/script/test-behat-with-javascript
@@ -8,8 +8,8 @@ prepare_for_behat_with_js() {
     run_command "export DISPLAY=:99"
 
     # Download and configure ChromeDriver
-    if [ ! -f $SYLIUS_CACHE_DIR/chromedriver ]; then
-        run_command "curl http://chromedriver.storage.googleapis.com/2.30/chromedriver_linux64.zip > chromedriver.zip"
+    if [ ! -f $SYLIUS_CACHE_DIR/chromedriver ] || [ "$($SYLIUS_CACHE_DIR/chromedriver --version | grep -c 2.34)" = "0" ]; then
+        run_command "curl http://chromedriver.storage.googleapis.com/2.34/chromedriver_linux64.zip > chromedriver.zip"
         run_command "unzip chromedriver.zip"
         run_command "chmod +x chromedriver"
         run_command "mv chromedriver $SYLIUS_CACHE_DIR"
@@ -19,7 +19,7 @@ prepare_for_behat_with_js() {
     run_command "$SYLIUS_CACHE_DIR/chromedriver > /dev/null 2>&1 &"
 
     # Download and configure Selenium
-    if [ ! -f $SYLIUS_CACHE_DIR/selenium.jar ]; then
+    if [ ! -f $SYLIUS_CACHE_DIR/selenium.jar ] || [ "$(java -jar $SYLIUS_CACHE_DIR/selenium.jar --version | grep -c 3.4.0)" = "0" ]; then
         run_command "curl http://selenium-release.storage.googleapis.com/3.4/selenium-server-standalone-3.4.0.jar > selenium.jar"
         run_command "mv selenium.jar $SYLIUS_CACHE_DIR"
     fi