Initial work to port to Behat 3.

behat.yml.dist

@@ -1,12 +1,15 @@
 default:
-  filters:
-    tags: "~@api&&~@drush"
+  suites:
+    default:
+      contexts: [Behat\MinkExtension\Context\MinkContext, Drupal\DrupalExtension\Context\DrupalContext]
+      filters:
+        tags: "~@api&&~@drush"
   extensions:
-    Behat\MinkExtension\Extension:
+    Behat\MinkExtension:
       goutte: ~
       selenium2: ~
       base_url: http://drupal.org
-    Drupal\DrupalExtension\Extension:
+    Drupal\DrupalExtension:
       blackbox: ~
       region_map:
         content: "#content"

src/Drupal/DrupalExtension/Context/DrupalAwareInterface.php

@@ -2,10 +2,11 @@
 
 namespace Drupal\DrupalExtension\Context;
 
+use Behat\Behat\Context\Context;
 use Drupal\Drupal;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
-interface DrupalAwareInterface {
+interface DrupalAwareInterface extends Context {
 
   /**
    * Sets Drupal instance.

src/Drupal/DrupalExtension/Context/DrupalContext.php

@@ -14,10 +14,9 @@
 use Symfony\Component\Process\Process;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
-use Behat\Behat\Context\Step\Given;
-use Behat\Behat\Context\Step\When;
-use Behat\Behat\Context\Step\Then;
-use Behat\Behat\Context\TranslatedContextInterface;
+use Behat\Behat\Definition\Call\Given;
+use Behat\Behat\Definition\Call\Then;
+use Behat\Behat\Context\TranslatableContext;
 
 use Behat\Gherkin\Node\PyStringNode;
 use Behat\Gherkin\Node\TableNode;
@@ -27,7 +26,7 @@
 /**
  * Features context.
  */
-class DrupalContext extends MinkContext implements DrupalAwareInterface, TranslatedContextInterface {
+class DrupalContext implements DrupalAwareInterface, TranslatableContext {
 
   private $drupal, $drupalParameters;
 
@@ -113,11 +112,8 @@ public function initializeSubContexts() {
    *
    * @return array
    */
-  public function getTranslationResources() {
-      $translationFilesParent = parent::getTranslationResources();
-      $translationFilesDrupal = glob(__DIR__ . '/../../../../i18n/*.xliff');
-      $translationFilesCombined = array_merge($translationFilesParent, $translationFilesDrupal);
-      return $translationFilesCombined;
+  public static function getTranslationResources() {
+    return glob(__DIR__ . '/../../../../i18n/*.xliff');
   }
 
   /**

src/Drupal/DrupalExtension/Extension.php → src/Drupal/DrupalExtension/ServiceContainer/DrupalExtension.php

@@ -1,25 +1,43 @@
 <?php
 
-namespace Drupal\DrupalExtension;
+namespace Drupal\DrupalExtension\ServiceContainer;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder,
-    Symfony\Component\DependencyInjection\Loader\YamlFileLoader,
-    Symfony\Component\Config\FileLocator,
-    Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
+use Behat\Testwork\ServiceContainer\Extension as ExtensionInterface;
+use Behat\Testwork\ServiceContainer\ExtensionManager;
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
-use Behat\Behat\Extension\ExtensionInterface;
+class DrupalExtension implements ExtensionInterface {
 
-class Extension implements ExtensionInterface {
+  /**
+   * Extension configuration ID.
+   */
+  const DRUPAL_ID = 'drupal';
 
   /**
-   * Loads a specific configuration.
-   *
-   * @param array $config
-   *   Extension configuration (from behat.yml).
-   * @param ContainerBuilder $container
-   *   ContainerBuilder instance.
+   * Selectors handler ID.
+   */
+  const SELECTORS_HANDLER_ID = 'drupal.selectors_handler';
+
+  /**
+   * {@inheritDoc}
+   */
+  public function getConfigKey() {
+    return SELF::DRUPAL_ID;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function initialize(ExtensionManager $extensionManager) {
+  }
+
+  /**
+   * {@inheritDoc}
    */
-  public function load(array $config, ContainerBuilder $container) {
+  public function load(ContainerBuilder $container, array $config) {
     $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/config'));
     $loader->load('services.yml');
     $container->setParameter('drupal.drupal.default_driver', $config['default_driver']);
@@ -59,13 +77,19 @@ public function load(array $config, ContainerBuilder $container) {
     }
   }
 
+  /**
+   * {@inheritDoc}
+   */
+  public function process(ContainerBuilder $container) {
+  }
+
   /**
    * Setup configuration for this extension.
    *
    * @param ArrayNodeDefinition $builder
    *   ArrayNodeDefinition instance.
    */
-  public function getConfig(ArrayNodeDefinition $builder) {
+  public function configure(ArrayNodeDefinition $builder) {
     $builder->
       children()->
         arrayNode('basic_auth')->
@@ -144,6 +168,13 @@ public function getConfig(ArrayNodeDefinition $builder) {
     end();
   }
 
+  /**
+   * Load Drupal Extension selectors handler.
+   */
+  private function loadSelectorsHandler(ContainerBuilder $container) {
+    $container->setDefinition(self::SELECTORS_HANDLER_ID);
+  }
+
   /**
    * Returns compiler passes used by mink extension.
    *

src/Drupal/DrupalExtension/config/services.yml → src/Drupal/DrupalExtension/ServiceContainer/config/services.yml

@@ -70,7 +70,7 @@ services:
     class: %drupal.context.region_selector.class%
     arguments:
       # inject the CSSSelector
-      - "@behat.mink.selector.css"
+      - "@mink.selector.css"
       - %drupal.region_map%
     tags:
-      - { name: behat.mink.selector, alias: region }
+      - { name: mink.selector, alias: region }