Merge pull request #586 from jhedstrom/585-fix-travis

585: Fix travis.

Author: jhedstrom

.travis.yml

@@ -1,9 +1,8 @@
 language: php
 
 php:
-  - 7.1
-  - 7.2
   - 7.3
+  - 7.4
 
 env:
   global:
@@ -12,6 +11,7 @@ env:
   matrix:
     - DRUPAL_VERSION=7
     - DRUPAL_VERSION=8
+    - DRUPAL_VERSION=9
 
 # Enable Travis containers.
 sudo: false
@@ -26,37 +26,36 @@ install:
   # @see https://github.com/jhedstrom/drupalextension/issues/413
   # @todo Re-enable behat drush endpoint testing.
   # @see https://github.com/jhedstrom/drupalextension/issues/458
-  - test ${DRUPAL_VERSION} -ne 8 || COMPOSER_MEMORY_LIMIT=-1 travis_retry composer require drush/drush:~10.0 symfony/dependency-injection:3.4.4
+  - test ${DRUPAL_VERSION} -lt 8 || composer require --no-interaction --dev --no-update drupal/core-recommended:^${DRUPAL_VERSION} drupal/core-composer-scaffold:^${DRUPAL_VERSION} drush/drush:^10
+  # Remove core/drush deps for Drupal 7.
+  - test ${DRUPAL_VERSION} -ge 8 || composer remove --dev drush/drush drupal/core-recommended drupal/core-composer-scaffold
   - composer install
   # For Drupal 8, change composer.json to require symfony 3.x as conflicting
   # versions between the separate drupal and drupalextension vendor folders
   # can create conflicts.
-  # @todo Change test process to require drupalextension from the local folder
-  #   to let composer handle compatibility and simulate a more common process.
-  - test ${DRUPAL_VERSION} -ne 8 || COMPOSER_MEMORY_LIMIT=-1 travis_retry composer require "symfony/browser-kit:~3.4" "symfony/dependency-injection:~3.0" "symfony/translation:^3.4"
   # Install drush globally.
-  - (test ${DRUPAL_VERSION} -ne 8 && composer global require drush/drush:~8.0 drupal/drupal-driver) || composer global require drush/drush:~10.0
+  - (test ${DRUPAL_VERSION} -lt 8 && composer global require drush/drush:~8.0 drupal/drupal-driver) || composer global require drush/drush:~10.0
   # Install the Behat Drush Endpoint for Drupal 7 tests.
-  - test ${DRUPAL_VERSION} -ne 7 || (git clone https://github.com/drush-ops/behat-drush-endpoint.git drush/behat-drush-endpoint && (cd drush/behat-drush-endpoint && composer install && cd -))
+  - test ${DRUPAL_VERSION} -gt 7 || (git clone https://github.com/drush-ops/behat-drush-endpoint.git drush/behat-drush-endpoint && (cd drush/behat-drush-endpoint && composer install --no-dev && cd -))
   # Pin node version.
   # @see http://austinpray.com/ops/2015/09/20/change-travis-node-version.html
   - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
   - npm install
 
 before_script:
   # Define the module path according to the Drupal version being tested.
-  - test ${DRUPAL_VERSION} -ne 8 || export MODULE_PATH="drupal/modules"
-  - test ${DRUPAL_VERSION} -eq 8 || export MODULE_PATH="drupal/sites/all/modules" && mkdir -p ${MODULE_PATH}
+  - test ${DRUPAL_VERSION} -lt 8 || export MODULE_PATH="drupal/modules"
+  - test ${DRUPAL_VERSION} -ge 8 || export MODULE_PATH="drupal/sites/all/modules" && mkdir -p ${MODULE_PATH}
   # Set sendmail so drush doesn't throw an error during site install.
   - echo "sendmail_path='true'" >> `php --ini | grep "Loaded Configuration" | awk '{print $4}'`
   - mysql -e 'create database drupal'
   # Download and install Drupal so we can test API abilities.
   # For Drush 9, dl is deprecated so we must use composer. However, we still
   # cannot simply require drupal/drupal since it hardcodes it's autoloader
   # and we'd need to use drupal-scaffold, etc, etc.
-  - test ${DRUPAL_VERSION} -eq 8 || drush dl --quiet --yes drupal-${DRUPAL_VERSION}.x --all --drupal-project-rename=drupal
-  - test ${DRUPAL_VERSION} -ne 8 || (mkdir -p tmp && cd tmp && composer require --no-interaction drupal/drupal && cd - && rm -rf drupal && mv tmp/vendor/drupal/drupal ./drupal && cd drupal && composer install && cd - && rm -rf tmp)
-  - drush --yes --root=$PWD/drupal site-install --db-url=mysql://travis:@127.0.0.1/drupal
+  - test ${DRUPAL_VERSION} -ge 8 || drush dl --quiet --yes drupal-${DRUPAL_VERSION}.x --all --drupal-project-rename=drupal
+  # Install Drupal.
+  - drush --yes --root=$PWD/drupal site-install --db-url=mysql://travis:@127.0.0.1/drupal --debug
   # Copy the static HTML that is used for blackbox testing in the web root.
   - cp -r fixtures/blackbox $PWD/drupal
   # Copy our test module to the correct location.
@@ -70,11 +69,11 @@ before_script:
   # Only revert features on Drupal 7.
   - test \! ${DRUPAL_VERSION} -eq 7 || drush --yes fr behat_test
   # Disable the page cache on Drupal 8.
-  - test \! ${DRUPAL_VERSION} -eq 8 || drush --yes pmu page_cache
+  - test \! ${DRUPAL_VERSION} -ge 8 || drush --yes pmu page_cache
   # Test with big_pipe enabled for Drupal 8.
-  - test \! ${DRUPAL_VERSION} -eq 8 || drush --yes en -y big_pipe
+  - test \! ${DRUPAL_VERSION} -ge 8 || drush --yes en -y big_pipe
   # Clear the cache on Drupal 6 and 7, rebuild on Drupal 8.
-  - test ${DRUPAL_VERSION} -eq 8 && drush cr || drush cc all || true
+  - test ${DRUPAL_VERSION} -ge 8 && drush cr || drush cc all || true
   - drush --debug runserver :8888 > ~/debug.txt 2>&1 &
   - cd -
   - sleep 4s

behat.yml.dist

@@ -30,8 +30,8 @@ default:
         warning_message_selector: '.messages.warning'
 
 # Separate profile for testing using the api driver. This assumes a
-# stock Drupal 6 install.
-drupal6:
+# stock Drupal 7 install.
+drupal7:
   suites:
     default:
       contexts:
@@ -40,7 +40,7 @@ drupal6:
         - Drupal\DrupalExtension\Context\MinkContext
         - Drupal\DrupalExtension\Context\MarkupContext
       filters:
-        tags: "@d6"
+        tags: "@d7"
   extensions:
     Drupal\MinkExtension:
       base_url: http://127.0.0.1:8888
@@ -52,57 +52,64 @@ drupal6:
       region_map:
         left sidebar: "#sidebar-first"
         content: "#content"
-# Separate profile for testing using the api driver. This assumes a
-# stock Drupal 7 install.
-drupal7:
+
+# Separate profile for testing using the Drush driver. Assumes a stock
+# Drupal 7 install.
+drush:
   suites:
     default:
       contexts:
         - FeatureContext
         - Drupal\DrupalExtension\Context\DrupalContext
+        - Drupal\DrupalExtension\Context\DrushContext
         - Drupal\DrupalExtension\Context\MinkContext
         - Drupal\DrupalExtension\Context\MarkupContext
       filters:
-        tags: "@d7"
+        tags: "@drushTest"
   extensions:
     Drupal\MinkExtension:
       base_url: http://127.0.0.1:8888
     Drupal\DrupalExtension:
-      api_driver: "drupal"
-      drupal:
-        # Change this to the absolute path to Drupal install.
-        drupal_root: "drupal"
+      api_driver: "drush"
+      drush_driver: "drush"
+      drush:
+        root: "drupal"
       region_map:
         left sidebar: "#sidebar-first"
         content: "#content"
 
-# Separate profile for testing using the Drush driver. Assumes a stock
-# Drupal 7 install.
-drush:
+# Separate profile for testing D8. Assumes a stock Drupal 8 install.
+drupal8:
   suites:
     default:
       contexts:
         - FeatureContext
+        - Drupal\DrupalExtension\Context\ConfigContext
         - Drupal\DrupalExtension\Context\DrupalContext
-        - Drupal\DrupalExtension\Context\DrushContext
         - Drupal\DrupalExtension\Context\MinkContext
         - Drupal\DrupalExtension\Context\MarkupContext
+        - Drupal\DrupalExtension\Context\MessageContext
+        - Drupal\DrupalExtension\Context\MailContext
+        - Drupal\DrupalExtension\Context\RandomContext
       filters:
-        tags: "@drushTest"
+        tags: "@d8&&~@d8wip"
   extensions:
     Drupal\MinkExtension:
       base_url: http://127.0.0.1:8888
     Drupal\DrupalExtension:
-      api_driver: "drush"
-      drush_driver: "drush"
-      drush:
-        root: "drupal"
+      api_driver: "drupal"
+      drupal:
+        # Change this to the absolute path to Drupal install.
+        drupal_root: "drupal"
       region_map:
         left sidebar: "#sidebar-first"
         content: "#content"
+      selectors:
+        error_message_selector: '.messages--error'
 
-# Separate profile for testing D8. Assumes a stock Drupal 8 install.
-drupal8:
+# Separate profile for testing D9. Assumes a stock Drupal 9 install.
+# This uses the same tags as Drupal 8.
+drupal9:
   suites:
     default:
       contexts:

composer.json

@@ -19,7 +19,6 @@
       "homepage": "https://github.com/pfrenssen"
     }
   ],
-  "minimum-stability": "dev",
   "prefer-stable": true,
   "require": {
     "behat/behat": "~3.2",
@@ -33,9 +32,13 @@
     "symfony/translation": "^3.4|~4.4"
   },
   "require-dev": {
-    "phpspec/phpspec": "~2.0 || ~4.0",
+    "composer/installers": "^1.2",
+    "drupal/coder": "^8.3",
+    "drupal/core-composer-scaffold": "^9.1",
+    "drupal/core-recommended": "^9.1",
+    "drush/drush": "^10.5",
     "jakub-onderka/php-parallel-lint": "^0.9.2",
-    "drupal/coder": "^8.3"
+    "phpspec/phpspec": "^4.0 || ^6.0"
   },
   "scripts": {
     "test": [
@@ -58,6 +61,16 @@
   "extra": {
     "branch-alias": {
       "dev-master": "4.1.x-dev"
+    },
+    "installer-paths": {
+      "drupal/core": [
+        "type:drupal-core"
+      ]
+    },
+    "drupal-scaffold": {
+      "locations": {
+        "web-root": "drupal/"
+      }
     }
-  }
+}
 }

fixtures/drupal6/modules/behat_test/behat_test.info

@@ -2,6 +2,6 @@ name: Behat test
 type: module
 description: 'Test feature exposing basic configuration for Behat Drupal extension test.'
 package: Test
-core: '8.x'
+core_version_requirement: ^8 || ^9
 dependencies:
   - language

fixtures/drupal6/modules/behat_test/behat_test.install

@@ -0,0 +1,7 @@
+name: Behat test
+type: module
+description: 'Test feature exposing basic configuration for Behat Drupal extension test.'
+package: Test
+core_version_requirement: ^8 || ^9
+dependencies:
+  - language

fixtures/drupal6/modules/behat_test/behat_test.module

@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * @file
+ * Install hooks for the behat_test module.
+ */
+
+/**
+ * Implements hook_install().
+ */
+function behat_test_install() {
+  $storage = \Drupal::service('behat_test.config.storage.install');
+
+  // Override Standard profile's user settings with our own.
+  $config_names = [
+    'core.entity_form_mode.user.register',
+    'core.entity_form_display.user.user.default',
+    'core.entity_view_display.user.user.default',
+    'core.entity_view_display.user.user.compact',
+    'core.entity_view_mode.user.compact',
+    'core.entity_view_mode.user.full',
+  ];
+
+  foreach ($config_names as $config_name) {
+    $data = $storage->read($config_name);
+    \Drupal::configFactory()->getEditable($config_name)->setData($data)->save();
+  }
+}

fixtures/drupal8/modules/behat_test/behat_test.info.yml

@@ -0,0 +1,4 @@
+services:
+  behat_test.config.storage.install:
+    class: Drupal\behat_test\Config\BehatTestExtensionInstallStorage
+    arguments: ['@config.storage', 'config/install', '', true, '%install_profile%']