From af06f803c56756e395359ffacbfaf2e8370b93a0 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Fri, 1 Jun 2018 15:25:04 +1200
Subject: [PATCH 1/2] FIX Re-enable Behat using chromedriver and
 silverstripe/recipe-testing

---
 .travis.yml   | 36 +++++++++++++++++++++---------------
 behat.yml     | 12 +++++++-----
 composer.json |  5 +----
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a1270c5..8fc253e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,47 +1,53 @@
 language: php
 
-addons:
-  firefox: "31.0"
-
 dist: trusty
 
+before_install:
+ - sudo apt-get update
+ - sudo apt-get install chromium-chromedriver
+
 env:
   global:
-    - COMPOSER_ROOT_VERSION="4.0.x-dev"
+    - COMPOSER_ROOT_VERSION="2.0.x-dev"
     - DISPLAY=":99"
     - XVFBARGS=":99 -ac -screen 0 1024x768x16"
+    - SS_BASE_URL="http://localhost:8080/"
+    - SS_ENVIRONMENT_TYPE="dev"
 
 matrix:
   include:
     - php: 5.6
       env: DB=MYSQL INSTALLER_VERSION=4.0.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
-    - php: 7.1
+    - php: 7.0
       env: DB=PGSQL INSTALLER_VERSION=4.1.x-dev PHPUNIT_TEST=1
+    - php: 7.1
+      env: DB=MYSQL INSTALLER_VERSION=4.1.x-dev BEHAT_TEST=1
     - php: 7.2
       env: DB=MYSQL INSTALLER_VERSION=4.2.x-dev PHPUNIT_COVERAGE_TEST=1
-    - php: 7.0
-      env: DB=MYSQL INSTALLER_VERSION=4.x-dev BEHAT_TEST=1
-  allow_failures:
-    - php: 7.0
+    - php: 7.2
       env: DB=MYSQL INSTALLER_VERSION=4.x-dev BEHAT_TEST=1
 
 before_script:
+  # Extra $PATH
+  - export PATH=/usr/lib/chromium-browser/:$PATH
+
+  # Init PHP
   - phpenv rehash
   - phpenv config-rm xdebug.ini
   - echo 'memory_limit = 2G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+
+  # Install composer
   - composer validate
-  - composer require silverstripe/installer $INSTALLER_VERSION --no-update
+  - composer require silverstripe/installer:"$INSTALLER_VERSION" silverstripe/recipe-testing:^1 --no-update
   - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.0.x-dev; fi
   - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
-  - echo "SS_BASE_URL=http://localhost:8080/" >> .env
 
   # Behat bootstrapping
-  - if [[ $BEHAT_TEST ]]; then echo "" >> .env && echo "SS_BASE_URL=http://localhost:8080/" >> .env; fi
   - if [[ $BEHAT_TEST ]]; then mkdir artifacts; fi
+  - if [[ $BEHAT_TEST ]]; then cp composer.lock artifacts/; fi
   - if [[ $BEHAT_TEST ]]; then sh -e /etc/init.d/xvfb start; sleep 3; fi
-  - if [[ $BEHAT_TEST ]]; then (vendor/bin/selenium-server-standalone > artifacts/selenium.log 2>&1 &); fi
-  - if [[ $BEHAT_TEST ]]; then (vendor/bin/serve --bootstrap-file cms/tests/behat/serve-bootstrap.php &> artifacts/serve.log &); fi
-
+  - if [[ $BEHAT_TEST ]]; then (chromedriver > artifacts/chromedriver.log 2>&1 &); fi
+  - if [[ $BEHAT_TEST ]]; then (vendor/bin/serve --bootstrap-file vendor/silverstripe/cms/tests/behat/serve-bootstrap.php &> artifacts/serve.log &); fi
 
 script:
   - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
diff --git a/behat.yml b/behat.yml
index 8db3ded..38e7b19 100644
--- a/behat.yml
+++ b/behat.yml
@@ -12,15 +12,17 @@ default:
         - SilverStripe\CMS\Tests\Behaviour\LoginContext
         - SilverStripe\CMS\Tests\Behaviour\ThemeContext
         - SilverStripe\CMS\Tests\Behaviour\FixtureContext:
-        # Note: double indent for args is intentional
+            # Note: double indent for args is intentional
             - %paths.modules.subsites%/tests/behat/features/files/
 
   extensions:
     SilverStripe\BehatExtension\MinkExtension:
-      default_session: selenium2
-      javascript_session: selenium2
-      selenium2:
-        browser: firefox
+      default_session: facebook_web_driver
+      javascript_session: facebook_web_driver
+      facebook_web_driver:
+        browser: chrome
+        wd_host: "http://127.0.0.1:9515" #chromedriver port
+      browser_name: chrome
 
     SilverStripe\BehatExtension\Extension:
       screenshot_path: %paths.base%/artifacts/screenshots
diff --git a/composer.json b/composer.json
index 23e8331..4f8576f 100644
--- a/composer.json
+++ b/composer.json
@@ -24,10 +24,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7",
-        "squizlabs/php_codesniffer": "^3.0",
-        "silverstripe/behat-extension": "^3",
-        "silverstripe/serve": "^2.0",
-        "se/selenium-server-standalone": "2.41.0"
+        "squizlabs/php_codesniffer": "^3.0"
     },
     "autoload": {
         "psr-4": {

From c30c0d94eb265635c65650705a5c96762e79d5d6 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Thu, 7 Jun 2018 16:00:52 +1200
Subject: [PATCH 2/2] Increase memory limit in Travis configuration

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8fc253e..7c1453e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ before_script:
   # Init PHP
   - phpenv rehash
   - phpenv config-rm xdebug.ini
-  - echo 'memory_limit = 2G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  - echo 'memory_limit=3G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
   # Install composer
   - composer validate