Merge pull request #39 from swestcott/master

Set default value for WebDriver proxy config
2012-09-20 07:36:59 -07:00
parent e9889202ff 0fa25fc9e5
commit 37dfaecd23
1 changed files with 5 additions and 2 deletions
--- a/src/Behat/MinkExtension/Extension.php
+++ b/src/Behat/MinkExtension/Extension.php
@@ -244,8 +244,11 @@ class Extension implements ExtensionInterface
                                booleanNode('acceptSslCerts')->end()->
                                booleanNode('nativeEvents')->end()->
                                arrayNode('proxy')->
-                                    useAttributeAsKey('key')->
-                                    prototype('variable')->end()->
+                                    children()->
+                                        scalarNode('proxyType')->
+                                            defaultValue(isset($config['selenium2']['capabilities']['proxy']['proxyType']) ? $config['selenium2']['capabilities']['proxy']['proxyType'] : 'system')->
+                                        end()->
+                                    end()->
                                end()->
                                arrayNode('chrome')->
                                    children()->