From e3749ff6f2369e9a8d47bef35a552b95faed11b4 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Thu, 15 May 2014 11:02:13 +0200 Subject: [PATCH 1/5] Updated the composer constraints to allow Mink 1.6 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9806f221..b305f4d6 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "require": { "php": ">=5.3.2", "behat/behat": "~2.5.0", - "behat/mink": ">=1.4.3,<1.6-dev", + "behat/mink": "~1.5", "symfony/config": "~2.2" }, From b885b9407cba50a954f72c69ed1b2f8d3bc694f8 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Thu, 15 May 2014 21:27:39 +0200 Subject: [PATCH 2/5] Added a safeguard for the Goutte version in MinkGoutteDriver MinkGoutteDriver 1.2 will be compatible with both Goutte 1.x and Goutte 2.x, but MinkExtension 1.3 only supports configuring Goutte 1.x. Upgrading to Goutte 2.x will be possible only when using MinkExtension 2.0. --- composer.json | 1 + src/Behat/MinkExtension/Extension.php | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/composer.json b/composer.json index b305f4d6..d54d8e0b 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ }, "require-dev": { + "fabpot/goutte": "~1.0", "behat/mink-goutte-driver": "~1.0" }, diff --git a/src/Behat/MinkExtension/Extension.php b/src/Behat/MinkExtension/Extension.php index 8e8c3a54..fce6fb9f 100644 --- a/src/Behat/MinkExtension/Extension.php +++ b/src/Behat/MinkExtension/Extension.php @@ -53,6 +53,13 @@ public function load(array $config, ContainerBuilder $container) ); } + $refl = new \ReflectionParameter(array('Goutte\Client', 'setClient'), 0); + if (!$refl->getClass() || 'Guzzle\Http\ClientInterface' !== $refl->getClass()->getName()) { + throw new \RuntimeException( + 'MinkExtension 1.3 only supports Goutte 1.x for MinkGoutteDriver, not Goutte 2.x.' + ); + } + $loader->load('sessions/goutte.xml'); } if (isset($config['sahi'])) { From 9caf48060bdf6be811fd12014f7963cf0703f35c Mon Sep 17 00:00:00 2001 From: Eldar Gafurov Date: Thu, 17 Jul 2014 11:15:08 -0400 Subject: [PATCH 3/5] Added noProxy configuration support to selenium2 proxy capability. --- src/Behat/MinkExtension/Extension.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Behat/MinkExtension/Extension.php b/src/Behat/MinkExtension/Extension.php index fce6fb9f..488644e8 100644 --- a/src/Behat/MinkExtension/Extension.php +++ b/src/Behat/MinkExtension/Extension.php @@ -334,6 +334,7 @@ public function getConfig(ArrayNodeDefinition $builder) scalarNode('ftpProxy')->end()-> scalarNode('httpProxy')->end()-> scalarNode('sslProxy')->end()-> + scalarNode('noProxy')->end()-> end()-> validate()-> ifTrue(function ($v) { From 3942bd4fd4f919a3b64527dd7689251baf2fa317 Mon Sep 17 00:00:00 2001 From: Eldar Gafurov Date: Mon, 21 Jul 2014 16:39:40 -0400 Subject: [PATCH 4/5] Added socksProxy, socksUsername, and socksPassword configuration support to selenium2 proxy capability. --- src/Behat/MinkExtension/Extension.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Behat/MinkExtension/Extension.php b/src/Behat/MinkExtension/Extension.php index 488644e8..9ff68034 100644 --- a/src/Behat/MinkExtension/Extension.php +++ b/src/Behat/MinkExtension/Extension.php @@ -334,6 +334,9 @@ public function getConfig(ArrayNodeDefinition $builder) scalarNode('ftpProxy')->end()-> scalarNode('httpProxy')->end()-> scalarNode('sslProxy')->end()-> + scalarNode('socksProxy')->end()-> + scalarNode('socksUsername')->end()-> + scalarNode('socksPassword')->end()-> scalarNode('noProxy')->end()-> end()-> validate()-> From ebf9c2c061d432b9ffb9d3418f732328cdd63dce Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 1 Mar 2015 20:52:17 +0100 Subject: [PATCH 5/5] Update dutch translations --- i18n/nl.xliff | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/i18n/nl.xliff b/i18n/nl.xliff index 0719f300..7a414818 100644 --- a/i18n/nl.xliff +++ b/i18n/nl.xliff @@ -42,6 +42,10 @@ (?:[^"]|\\")*)" with "(?P(?:[^"]|\\")*)"$/]]> (?:[^"]|\\")*)" invul met "(?P(?:[^"]|\\")*)"$/]]> + + (?:[^"]|\\")*)" with:$/]]> + (?:[^"]|\\")*)" invul met:$/]]> + (?:[^"]|\\")*)" for "(?P(?:[^"]|\\")*)"$/]]> (?:[^"]|\\")*)" invul in "(?P(?:[^"]|\\")*)"$/]]> @@ -106,10 +110,22 @@ (?:[^"]|\\")*)" checkbox should be checked$/]]> (?:[^"]|\\")*)" aangevinkt zijn$/]]> + + (?:[^"]|\\")*)" (?:is|should be) checked$/]]> + (?:[^"]|\\")*)" (?:is|zou moeten zijn) aangevinkt$/]]> + + + (?:[^"]|\\")*)" should (?:be unchecked|not be checked)$/]]> + (?:[^"]|\\")*)" niet aangevinkt zijn$/]]> + (?:[^"]|\\")*)" checkbox should not be checked$/]]> (?:[^"]|\\")*)" niet aangevinkt zijn$/]]> + + (?:[^"]|\\")*)" is (?:unchecked|not checked)$/]]> + (?:[^"]|\\")*)" is niet aangevinkt$/]]> + [^"]+)"$/]]> [^"]+)" zijn$/]]> @@ -154,6 +170,10 @@ \d+)$/]]> \d+) zijn$/]]> + + + +