Merge pull request #467 from jhedstrom/466-configure-ajax-timeout

Allows AJAX timeout to be overridden.

CHANGELOG.md

@@ -0,0 +1,16 @@
+# Change log
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+
+### Added
+  * [#467](https://github.com/jhedstrom/drupalextension/pull/467): Allows
+     AJAX timeout to be overridden via an `ajax_timeout` parameter in `behat.yml`.
+     In order to utilize this parameter, `Drupal\MinkExtension` should be specified
+     in the `extensions` portion of `behat.yml` rather than `Behat\MinkExtension`.
+
+[Unreleased]: https://github.com/jhedstrom/drupalextension/compare/v4.0.0alpha2...HEAD

README.md

@@ -96,6 +96,8 @@ the [Full documentation](https://behat-drupal-extension.readthedocs.org)
 
 ## Release notes
 
+See [CHANGELOG](CHANGELOG.md).
+
 ### Backwards incompatible changes
 
 Starting with 3.3.0 Behat Drupal Extension depends on Behat 3.2.0 which

behat.yml.dist

@@ -11,7 +11,7 @@ default:
       filters:
         tags: "@blackbox"
   extensions:
-    Behat\MinkExtension:
+    Drupal\MinkExtension:
       goutte: ~
       zombie: ~
       base_url: http://127.0.0.1:8888/blackbox

composer.json

@@ -42,7 +42,8 @@
     "psr-0": {
       "Drupal\\Drupal": "src/",
       "Drupal\\Exception": "src/",
-      "Drupal\\DrupalExtension": "src/"
+      "Drupal\\DrupalExtension": "src/",
+      "Drupal\\MinkExtension": "src/"
     }
   },
   "extra": {

doc/_static/snippets/behat-1.yml

@@ -8,7 +8,7 @@ default:
         - Drupal\DrupalExtension\Context\MessageContext
         - Drupal\DrupalExtension\Context\DrushContext
   extensions:
-    Behat\MinkExtension:
+    Drupal\MinkExtension:
       goutte: ~
       selenium2: ~
       base_url: http://seven.l

doc/_static/snippets/behat-api.yml

@@ -6,7 +6,7 @@ default:
         - Drupal\DrupalExtension\Context\DrupalContext
         - Drupal\DrupalExtension\Context\MinkContext
   extensions:
-    Behat\MinkExtension:
+    Drupal\MinkExtension:
       goutte: ~
       selenium2: ~
       base_url: http://seven.l

doc/_static/snippets/behat-auto.yml

@@ -6,7 +6,7 @@ default:
         - Drupal\DrupalExtension\Context\DrupalContext
         - Drupal\DrupalExtension\Context\MinkContext
   extensions:
-    Behat\MinkExtension:
+    Drupal\MinkExtension:
       goutte: ~
       selenium2: ~
       base_url: http://seven.l

doc/_static/snippets/behat-bb.yml

@@ -6,7 +6,7 @@ default:
         - Drupal\DrupalExtension\Context\DrupalContext
         - Drupal\DrupalExtension\Context\MinkContext
   extensions:
-    Behat\MinkExtension:
+    Drupal\MinkExtension:
       goutte: ~
       selenium2: ~
       base_url: http://seven.l

doc/_static/snippets/behat-drush.yml

@@ -6,7 +6,7 @@ default:
         - Drupal\DrupalExtension\Context\DrupalContext
         - Drupal\DrupalExtension\Context\MinkContext
   extensions:
-    Behat\MinkExtension:
+    Drupal\MinkExtension:
       goutte: ~
       selenium2: ~
       base_url: http://seven.l

doc/_static/snippets/behat-sub.yml

@@ -8,7 +8,7 @@ default:
       paths:
         - "./path_to_module/features"
   extensions:
-    Behat\MinkExtension:
+    Drupal\MinkExtension:
       goutte: ~
       selenium2: ~
       base_url: http://seven.l

spec/Drupal/MinkExtension/ServiceContainer/MinkExtensionSpec.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace spec\Drupal\MinkExtension\ServiceContainer;
+
+use Behat\Testwork\ServiceContainer\Extension;
+use PhpSpec\ObjectBehavior;
+
+class MinkExtensionSpec extends ObjectBehavior
+{
+    function it_is_a_testwork_extension()
+    {
+        $this->shouldHaveType(Extension::class);
+    }
+
+    function it_is_named_mink()
+    {
+        $this->getConfigKey()->shouldReturn('mink');
+    }
+}

src/Drupal/DrupalExtension/Context/MinkContext.php

@@ -147,7 +147,7 @@ function isAjaxing(instance) {
       );
     }());
 JS;
-        $result = $this->getSession()->wait(5000, $condition);
+        $result = $this->getSession()->wait(1000 * $this->getMinkParameter('ajax_timeout'), $condition);
         if (!$result) {
             throw new \RuntimeException('Unable to complete AJAX request.');
         }

src/Drupal/MinkExtension/ServiceContainer/MinkExtension.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Drupal\MinkExtension\ServiceContainer;
+
+use Behat\MinkExtension\ServiceContainer\MinkExtension as BaseMinkExtension;
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
+
+class MinkExtension extends BaseMinkExtension
+{
+
+    /**
+     * Default wait time for AJAX to finish (in seconds).
+     *
+     * @var int
+     */
+    const AJAX_TIMEOUT = 5;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configure(ArrayNodeDefinition $builder)
+    {
+        parent::configure($builder);
+
+        // Add extended options.
+        $builder->
+        children()->
+        scalarNode('ajax_timeout')->
+            defaultValue(static::AJAX_TIMEOUT)->
+            info(sprintf('Change the maximum time to wait for AJAX calls to complete. Defaults to %s seconds.', static::AJAX_TIMEOUT))->
+        end();
+    }
+}