diff --git a/src/Behat/MinkExtension/ServiceContainer/Driver/Selenium2Factory.php b/src/Behat/MinkExtension/ServiceContainer/Driver/Selenium2Factory.php index b7a3e80..74be082 100644 --- a/src/Behat/MinkExtension/ServiceContainer/Driver/Selenium2Factory.php +++ b/src/Behat/MinkExtension/ServiceContainer/Driver/Selenium2Factory.php @@ -57,9 +57,12 @@ class Selenium2Factory implements DriverFactory )); } + $extraCapabilities = $config['capabilities']['extra_capabilities']; + unset($config['capabilities']['extra_capabilities']); + return new Definition('Behat\Mink\Driver\Selenium2Driver', array( $config['browser'], - $config['capabilities'], + array_replace($extraCapabilities, $config['capabilities']), $config['wd_host'], )); } @@ -125,6 +128,12 @@ class Selenium2Factory implements DriverFactory ->arrayNode('extensions')->prototype('scalar')->end()->end() ->end() ->end() + ->arrayNode('extra_capabilities') + ->info('Custom capabilities merged with the known ones') + ->normalizeKeys(false) + ->useAttributeAsKey('name') + ->prototype('variable')->end() + ->end() ->end(); return $node;