From c3a14f10f41e9ec9f68543329e47fc7926a511eb Mon Sep 17 00:00:00 2001 From: berliner Date: Fri, 9 Jun 2017 19:02:26 +0200 Subject: [PATCH 1/3] Support for additional zombie options --- .../MinkExtension/ServiceContainer/Driver/ZombieFactory.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Behat/MinkExtension/ServiceContainer/Driver/ZombieFactory.php b/src/Behat/MinkExtension/ServiceContainer/Driver/ZombieFactory.php index 9bafc84a..950a40ba 100644 --- a/src/Behat/MinkExtension/ServiceContainer/Driver/ZombieFactory.php +++ b/src/Behat/MinkExtension/ServiceContainer/Driver/ZombieFactory.php @@ -44,6 +44,10 @@ public function configure(ArrayNodeDefinition $builder) ->scalarNode('server_path')->defaultNull()->end() ->scalarNode('threshold')->defaultValue(2000000)->end() ->scalarNode('node_modules_path')->defaultValue('')->end() + ->arrayNode('options') + ->prototype('scalar')->end() + ->defaultValue(array()) + ->end() ->end() ; } @@ -67,6 +71,7 @@ public function buildDriver(array $config) $config['server_path'], $config['threshold'], $config['node_modules_path'], + $config['options'], )), )); } From 387dd2e14f94f607714e2b6f43498908ec1f0082 Mon Sep 17 00:00:00 2001 From: berliner Date: Sat, 10 Jun 2017 10:33:33 +0200 Subject: [PATCH 2/3] Update documentation --- doc/index.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/index.rst b/doc/index.rst index da802866..7888f0ad 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -198,7 +198,7 @@ with support for 7 drivers out of the box: the following parameters to avoid the validation error triggered by Guzzle: * For ``Guzzle 4`` or later: - + .. code-block:: yaml default: @@ -209,9 +209,9 @@ with support for 7 drivers out of the box: goutte: guzzle_parameters: verify: false - + * For ``Guzzle 3`` or earlier: - + .. code-block:: yaml default: @@ -298,6 +298,9 @@ with support for 7 drivers out of the box: zombie: # Specify the path to the node_modules directory. node_modules_path: /usr/local/lib/node_modules/ + options: + # Optionally specify zombie specific options like: + waitDuration: '5s' .. note:: From 7e91db5eb872cbbf0558a0376ac3dace2594f134 Mon Sep 17 00:00:00 2001 From: berliner Date: Fri, 23 Jun 2017 17:59:13 +0200 Subject: [PATCH 3/3] Changes according to PR review --- .../MinkExtension/ServiceContainer/Driver/ZombieFactory.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Behat/MinkExtension/ServiceContainer/Driver/ZombieFactory.php b/src/Behat/MinkExtension/ServiceContainer/Driver/ZombieFactory.php index 950a40ba..1b15914a 100644 --- a/src/Behat/MinkExtension/ServiceContainer/Driver/ZombieFactory.php +++ b/src/Behat/MinkExtension/ServiceContainer/Driver/ZombieFactory.php @@ -45,9 +45,9 @@ public function configure(ArrayNodeDefinition $builder) ->scalarNode('threshold')->defaultValue(2000000)->end() ->scalarNode('node_modules_path')->defaultValue('')->end() ->arrayNode('options') - ->prototype('scalar')->end() - ->defaultValue(array()) - ->end() + ->useAttributeAsKey('name') + ->prototype('scalar')->end() + ->end() ->end() ; }