Merge pull request Behat#39 from swestcott/master

Set default value for WebDriver proxy config
wouterj · Sep 20, 2012 · 37dfaec · 37dfaec
2 parents e988920 + 0fa25fc
commit 37dfaec
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Behat/MinkExtension/Extension.php b/src/Behat/MinkExtension/Extension.php
@@ -244,8 +244,11 @@ public function getConfig(ArrayNodeDefinition $builder)
                                 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()->