Merge 'master'

.gherkin-lintignore

@@ -0,0 +1 @@
+features/i18n/*/*.feature

.gherkin-lintrc

@@ -0,0 +1,36 @@
+{
+  "no-files-without-scenarios" : "on",
+  "no-unnamed-features": "on",
+  "no-unnamed-scenarios": "on",
+  "no-dupe-scenario-names": "on",
+  "no-dupe-feature-names": "on",
+  "no-partially-commented-tag-lines": "on",
+  "indentation": [
+    "on", {
+      "Feature": 0,
+      "Background": 2,
+      "Scenario": 2,
+      "Examples": 4,
+      "example": 6,
+      "Step": 4
+    }
+  ],
+  "no-trailing-spaces": "on",
+  "new-line-at-eof": ["on", "yes"],
+  "no-multiple-empty-lines": "on",
+  "no-empty-file": "on",
+  "no-scenario-outlines-without-examples": "on",
+  "name-length": [
+    "on", {
+      "Feature": 100,
+      "Scenario": 120,
+      "Step": "off"
+    }
+  ],
+  "no-restricted-tags": ["on", {"tags": ["@watch", "@wip"]}],
+  "use-and": "on",
+  "no-duplicate-tags": "on",
+  "no-superfluous-tags": "on",
+  "no-homogenous-tags": "off",
+  "one-space-between-tags": "on"
+}

.gitignore

@@ -4,4 +4,6 @@ composer.lock
 vendor
 /drupal*
 behat.yml
+/package-lock.json
 /node_modules
+/.docksal

.travis.yml

@@ -1,45 +1,32 @@
 language: php
 
 php:
-  - 5.5
-  - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 env:
   global:
-    - PATH=$PATH:/home/travis/.composer/vendor/bin
+    - PATH=$PATH:/home/travis/.config/composer/vendor/bin
     - TRAVIS_NODE_VERSION="4.0.0"
   matrix:
-    - DRUPAL_VERSION=6
     - DRUPAL_VERSION=7
     - DRUPAL_VERSION=8
 
-matrix:
-  exclude:
-    - php: 5.5
-      env: DRUPAL_VERSION=8
-    - php: 5.6
-      env: DRUPAL_VERSION=6
-    - php: 7.0
-      env: DRUPAL_VERSION=6
-    - php: 7.1
-      env: DRUPAL_VERSION=6
-  allow_failures:
-    - php: 7.1
-      env: DRUPAL_VERSION=7
-
 # Enable Travis containers.
 sudo: false
 
+services:
+  - mysql
+
 install:
   - composer self-update
   # For Drupal 8 install the behat drush endpoint.
   # Pins symfony/dependency-injection to match core.
   # @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 require --prefer-source drush/drush:~9.0 symfony/dependency-injection:3.4.4
+  - test ${DRUPAL_VERSION} -ne 8 || COMPOSER_MEMORY_LIMIT=-1 travis_retry composer require drush/drush:~9.0 symfony/dependency-injection:3.4.4
   - composer install
   # Install drush globally.
   - (test ${DRUPAL_VERSION} -ne 8 && composer global require drush/drush:~8.0 drupal/drupal-driver) || composer global require drush/drush:~9.0
@@ -51,8 +38,6 @@ install:
   - npm install
 
 before_script:
-  # Set NODE_PATH for zombie driver.
-  - export NODE_PATH="`pwd`/node_modules"
   # 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}
@@ -75,7 +60,7 @@ before_script:
   - drush cc drush
   # @todo Re-enable behat drush endpoint testing.
   # @see https://github.com/jhedstrom/drupalextension/issues/458
-  - test ${DRUPAL_VERSION} -eq 6 || test ${DRUPAL_VERSION} -eq 8 || (test ${DRUPAL_VERSION} -eq 7 && drush help behat)
+  # - test ${DRUPAL_VERSION} -eq 6 || test ${DRUPAL_VERSION} -eq 8 || (test ${DRUPAL_VERSION} -eq 7 && drush help behat)
   # Only revert features on Drupal 7.
   - test \! ${DRUPAL_VERSION} -eq 7 || drush --yes fr behat_test
   # Disable the page cache on Drupal 8.
@@ -90,6 +75,7 @@ before_script:
 
 script:
   - composer test
+  - npm test
   - vendor/bin/behat -fprogress --strict
   - vendor/bin/behat -fprogress --profile=drupal${DRUPAL_VERSION} --strict
   # Do not test the Drush profile unless Drupal 7 was installed.

CHANGELOG.md

@@ -6,6 +6,42 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+## [4.0.1] 2019-10-08
+### Fixed
+  * [#552](https://github.com/jhedstrom/drupalextension/issue/552) Remove hard-coded symfony/event-dispatcher requirement.
+### Changed
+  * [#553](https://github.com/jhedstrom/drupalextension/pull/553) Remove testing on PHP 5.6 and Drupal 6
+## [4.0.0] 2019-09-27
+## [4.0.0 rc1] 2019-07-24
+### Changed
+  * [#528](https://github.com/jhedstrom/drupalextension/pull/528) Show a more helpful failure when running `@javascript`
+    scenarios with incorrect configuration.
+  * [#545](https://github.com/jhedstrom/drupalextension/issue/545) Remove Zombie JS testing on Travis.  
+  * [#518](https://github.com/jhedstrom/drupalextension/issue/518) Subcontexts are deprecated and will be removed in v4.1.0.
+### Added
+  * [#527](https://github.com/jhedstrom/drupalextension/pull/527) Provide a step to check that a button is not in a region.
+  * [#543](https://github.com/jhedstrom/drupalextension/issue/543) Run gherkin-lint against feature files on Travis.
+  * [#544](https://github.com/jhedstrom/drupalextension/issue/544) Added a 'Contributing' section to the README.
+### Fixed
+  * [#542](https://github.com/jhedstrom/drupalextension/pull/542) Fix issue with certain symfony 4 components being pulled in.
+  * [#537](https://github.com/jhedstrom/drupalextension/pull/537) Remove usage of deprecated `SnippetAcceptingContext`.
+
+## [4.0.0 beta2] 2018-12-19
+### Added
+  * [#514](https://github.com/jhedstrom/drupalextension/pull/514) Add a note about the need to remove the entries in behat.yml to use BEHAT_PARAMS.
+  * [#504](https://github.com/jhedstrom/drupalextension/issues/504) Added Gherkin linting.
+  * [#507](https://github.com/jhedstrom/drupalextension/pull/511) Test Drupal 7 on PHP 7.
+  * [#516](https://github.com/jhedstrom/drupalextension/pull/516) Warn users when message table is not correctly formatted.
+### Changed
+  * [#510](https://github.com/jhedstrom/drupalextension/pull/510) Provide TagTrait to replace ScenarioTagTrait.
+  * [#512](https://github.com/jhedstrom/drupalextension/pull/512) Start testing on PHP 7.2.
+  * [#521](https://github.com/jhedstrom/drupalextension/pull/521) Updated tests to work with DrupalDriver string field handlers change.
+### Fixed
+  * [#522](https://github.com/jhedstrom/drupalextension/pull/522) Composer path changed on travis.
+  * [#520](https://github.com/jhedstrom/drupalextension/pull/520) Removes patch applied to Features module that was committed.
+  * [#502](https://github.com/jhedstrom/drupalextension/pull/502) RawDrupalContext::loggedIn() can return false positive.
+  * [#507](https://github.com/jhedstrom/drupalextension/issues/507) PHP coding standards update.
+  * [#499](https://github.com/jhedstrom/drupalextension/pull/499) Fix config context backup strategy.
 ## [4.0.0 beta1] 2018-04-17
 ### Added
   * [#479](https://github.com/jhedstrom/drupalextension/issues/479): Provide more verbose exception when AJAX fails.
@@ -77,7 +113,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
   * [#437](https://github.com/jhedstrom/drupalextension/pull/437): Radio button selector fix.
   * [#439](https://github.com/jhedstrom/drupalextension/pull/439): Symfony 3 compatibility follow-up fix.
 
-[Unreleased]: https://github.com/jhedstrom/drupalextension/compare/v4.0.0beta1...HEAD
+[Unreleased]: https://github.com/jhedstrom/drupalextension/compare/v4.0.1...HEAD
+[4.0.1]: https://github.com/jhedstrom/drupalextension/compare/v4.0.0...v4.0.1
+[4.0.0]: https://github.com/jhedstrom/drupalextension/compare/v4.0.0rc1...v4.0.0
+[4.0.0 rc1]: https://github.com/jhedstrom/drupalextension/compare/v4.0.0beta2...v4.0.0rc1
+[4.0.0 beta2]: https://github.com/jhedstrom/drupalextension/compare/v4.0.0beta1...v4.0.0beta2
 [4.0.0 beta1]: https://github.com/jhedstrom/drupalextension/compare/v4.0.0alpha4...v4.0.0beta1
 [4.0.0 alpha4]:https://github.com/jhedstrom/drupalextension/compare/v4.0.0alpha3...v4.0.0alpha4
 [4.0.0 alpha3]:https://github.com/jhedstrom/drupalextension/compare/v4.0.0alpha2...v4.0.0alpha3

README.md

@@ -48,7 +48,7 @@ the [Full documentation](https://behat-drupal-extension.readthedocs.org)
         contexts:
           - Drupal\DrupalExtension\Context\DrupalContext
     extensions:
-      Behat\MinkExtension:
+      Drupal\MinkExtension:
         goutte: ~
         base_url: http://example.org/  # Replace with your site's URL
       Drupal\DrupalExtension:
@@ -98,6 +98,11 @@ the [Full documentation](https://behat-drupal-extension.readthedocs.org)
 
 See [CHANGELOG](CHANGELOG.md).
 
+## Contributing
+
+Features and bug fixes are welcome! First-time contributors can jump in with the
+issues tagged [good first issue](https://github.com/jhedstrom/drupalextension/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22).
+
 ### Backwards incompatible changes
 
 Starting with 3.3.0 Behat Drupal Extension depends on Behat 3.2.0 which

behat.yml.dist

@@ -13,9 +13,7 @@ default:
   extensions:
     Drupal\MinkExtension:
       goutte: ~
-      zombie: ~
       base_url: http://127.0.0.1:8888/blackbox
-      javascript_session: zombie
     Drupal\DrupalExtension:
       blackbox: ~
       region_map:
@@ -44,7 +42,7 @@ drupal6:
       filters:
         tags: "@d6"
   extensions:
-    Behat\MinkExtension:
+    Drupal\MinkExtension:
       base_url: http://127.0.0.1:8888
     Drupal\DrupalExtension:
       api_driver: "drupal"
@@ -67,7 +65,7 @@ drupal7:
       filters:
         tags: "@d7"
   extensions:
-    Behat\MinkExtension:
+    Drupal\MinkExtension:
       base_url: http://127.0.0.1:8888
     Drupal\DrupalExtension:
       api_driver: "drupal"
@@ -92,7 +90,7 @@ drush:
       filters:
         tags: "@drushTest"
   extensions:
-    Behat\MinkExtension:
+    Drupal\MinkExtension:
       base_url: http://127.0.0.1:8888
     Drupal\DrupalExtension:
       api_driver: "drush"
@@ -119,7 +117,7 @@ drupal8:
       filters:
         tags: "@d8&&~@d8wip"
   extensions:
-    Behat\MinkExtension:
+    Drupal\MinkExtension:
       base_url: http://127.0.0.1:8888
     Drupal\DrupalExtension:
       api_driver: "drupal"

composer.json

@@ -28,21 +28,22 @@
     "behat/mink-goutte-driver": "~1.0",
     "behat/mink-selenium2-driver": "~1.1",
     "drupal/drupal-driver": "dev-186-backend-auth",
+    "symfony/browser-kit": "^3.4",
     "symfony/dependency-injection": "~3.0",
-    "symfony/event-dispatcher": "~3.0"
+    "symfony/translation": "^3.4"
   },
   "require-dev": {
     "phpspec/phpspec": "~2.0 || ~4.0",
-    "behat/mink-zombie-driver": "^1.2",
     "jakub-onderka/php-parallel-lint": "^0.9.2",
-    "drupal/coder": "^8.2"
+    "drupal/coder": "~8.2.12"
   },
   "scripts": {
     "test": [
       "composer validate --no-interaction",
       "parallel-lint src spec features fixtures",
       "phpcs --standard=./phpcs-ruleset.xml -p",
       "phpcs --standard=./phpcs-drupal-ruleset.xml -p",
+      "npm test",
       "phpspec run -f pretty --no-interaction"
     ]
   },
@@ -56,7 +57,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "4.0.x-dev"
+      "dev-master": "4.1.x-dev"
     }
   }
 }

doc/_static/snippets/FeatureContext.php.inc

@@ -2,14 +2,13 @@
 
 use Behat\Behat\Tester\Exception\PendingException;
 use Drupal\DrupalExtension\Context\RawDrupalContext;
-use Behat\Behat\Context\SnippetAcceptingContext;
 use Behat\Gherkin\Node\PyStringNode;
 use Behat\Gherkin\Node\TableNode;
 
 /**
  * Defines application features from the specific context.
  */
-class FeatureContext extends RawDrupalContext implements SnippetAcceptingContext {
+class FeatureContext extends RawDrupalContext {
 
   /**
    * Initializes context.

doc/blackbox.rst

@@ -89,6 +89,8 @@ customized the label visible to users, you can change that text as follows:
 
      Drupal\DrupalExtension:
        text:
+         login_url: "/user"
+         logout_url: "/user/logout"
          log_out: "Sign out"
          log_in: "Sign in"
          password_field: "Enter your password"

doc/environment.rst

@@ -11,15 +11,15 @@ If you intend to run your tests on different environments these settings should
 not be committed to ``behat.yml``. Instead they should be exported in an
 environment variable. Before running tests Behat will check the ``BEHAT_PARAMS``
 environment variable and add these settings to the ones that are present in
-``behat.yml``. This variable should contain a JSON object with your settings.
+``behat.yml``. This variable should contain a JSON object with your settings. 
 
 Example JSON object:
 
 .. code-block:: json
 
     {
         "extensions": {
-            "Behat\\MinkExtension": {
+            "Drupal\\MinkExtension": {
                 "base_url": "http://myproject.localhost"
             },
             "Drupal\\DrupalExtension": {
@@ -36,7 +36,49 @@ object into a single line and surround with single quotes:
 
 .. code-block:: bash
 
-    $ export BEHAT_PARAMS='{"extensions":{"Behat\\MinkExtension":{"base_url":"http://myproject.localhost"},"Drupal\\DrupalExtension":{"drupal":{"drupal_root":"/var/www/myproject"}}}}'
+    $ export BEHAT_PARAMS='{"extensions":{"Drupal\\MinkExtension":{"base_url":"http://myproject.localhost"},"Drupal\\DrupalExtension":{"drupal":{"drupal_root":"/var/www/myproject"}}}}'
+
+You must also remove (or comment out) the entries that you use in behat.yml for the values in BEHAT_PARAMS to take affect.
+
+.. code-block:: yml
+
+    default:
+      suites:
+        default:
+          contexts:
+            - FeatureContext
+            - Drupal\DrupalExtension\Context\DrupalContext
+            - Drupal\DrupalExtension\Context\MinkContext
+            - Drupal\DrupalExtension\Context\MessageContext
+            - Drupal\DrupalExtension\Context\DrushContext
+      extensions:
+        Drupal\MinkExtension:
+          goutte: ~
+          selenium2: ~
+    # Must comment out for BEHAT_PARAMS to be effective.
+    #      base_url: http://seven.l
+        Drupal\DrupalExtension:
+          # Anything used in BEHAT_PARAMS must be removed or commented.
+          # drupal:
+            # drupal_root: /var/www
+          # drush:
+            # alias: '@site'
+          blackbox: ~
+
+    # You can use profiles if you wish to allow users to run tests locally.
+    # Usage: 
+    #   bin/behat --profile=local
+    local:
+      extensions:
+        Drupal\MinkExtension:
+        base_url: 'localhost'
+        Drupal\DrupalExtension:
+          drush:
+            alias: '@self'
+          drupal:
+            drupal_root: '../web'
+
+
 
 There is also a `Drush extension <https://github.com/pfrenssen/drush-bde-env>`_
 that can help you generate these environment variables.