diff --git a/composer.json b/composer.json index c32de9f..9806f22 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,8 @@ "require": { "php": ">=5.3.2", "behat/behat": "~2.5.0", - "behat/mink": ">=1.4.3,<1.6-dev" + "behat/mink": ">=1.4.3,<1.6-dev", + "symfony/config": "~2.2" }, "require-dev": { @@ -24,11 +25,5 @@ "autoload": { "psr-0": { "Behat\\MinkExtension": "src/" } - }, - - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } } } diff --git a/src/Behat/MinkExtension/Extension.php b/src/Behat/MinkExtension/Extension.php index 0b6265b..8e8c3a5 100644 --- a/src/Behat/MinkExtension/Extension.php +++ b/src/Behat/MinkExtension/Extension.php @@ -271,6 +271,7 @@ class Extension implements ExtensionInterface defaultValue(isset($config['selenium2']['browser']) ? $config['selenium2']['browser'] : '%behat.mink.browser_name%')-> end()-> arrayNode('capabilities')-> + normalizeKeys(false)-> children()-> scalarNode('browserName')-> defaultValue(isset($config['selenium2']['capabilities']['browserName']) ? $config['selenium2']['capabilities']['browserName'] : 'firefox')->