From cfd002cbd889c0691133c82c6ec8f9a9e9cf431b Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Fri, 11 May 2012 22:00:46 +0200
Subject: [PATCH] Changed the regex delimiter for "The url should match"

Using / as a regex delimiter when matching an url is a pain because it
forces to escape all / in the url (and there more often / than " in
an URL).
---
 i18n/cs.xliff                                      | 2 +-
 i18n/de.xliff                                      | 2 +-
 i18n/es.xliff                                      | 2 +-
 i18n/fr.xliff                                      | 4 ++--
 i18n/ja.xliff                                      | 4 ++--
 i18n/nl.xliff                                      | 2 +-
 i18n/pl.xliff                                      | 2 +-
 i18n/pt.xliff                                      | 2 +-
 i18n/ru.xliff                                      | 2 +-
 i18n/sv.xliff                                      | 2 +-
 src/Behat/MinkExtension/Context/MinkContext.php    | 2 +-
 src/Behat/MinkExtension/Context/MinkDictionary.php | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/i18n/cs.xliff b/i18n/cs.xliff
index 01d5afe..109c8f8 100644
--- a/i18n/cs.xliff
+++ b/i18n/cs.xliff
@@ -99,7 +99,7 @@
             <target><![CDATA[/^musím být na stránce "(?P<page>[^"]+)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the url should match "(?P<pattern>(?:[^"]|\\")*)"$/]]></source>
+            <source><![CDATA[/^the (?i)url(?-i) should match "(?P<pattern>(?:[^"]|\\")*)"$/]]></source>
             <target><![CDATA[/^(?:url|adresa|url adresa) musí mít tvar "(?P<pattern>(?:[^"]|\\")*)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
diff --git a/i18n/de.xliff b/i18n/de.xliff
index f74ded4..07811df 100644
--- a/i18n/de.xliff
+++ b/i18n/de.xliff
@@ -99,7 +99,7 @@
             <target><![CDATA[/^(?:|ich )sollte auf "(?P<page>[^"]+)" sein$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the url should match "(?P<pattern>(?:[^"]|\\")*)"$/]]></source>
+            <source><![CDATA[/^the (?i)url(?-i) should match "(?P<pattern>(?:[^"]|\\")*)"$/]]></source>
             <target><![CDATA[/^die Webadresse sollte mit "(?P<pattern>(?:[^"]|\\")*)" übereinstimmen$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
diff --git a/i18n/es.xliff b/i18n/es.xliff
index f2e387a..1fc0f7a 100644
--- a/i18n/es.xliff
+++ b/i18n/es.xliff
@@ -99,7 +99,7 @@
             <target><![CDATA[/^debo estar en "(?P<page>[^"]+)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the url should match "(?P<pattern>(?:[^"]|\\")*)"$/]]></source>
+            <source><![CDATA[/^the (?i)url(?-i) should match "(?P<pattern>(?:[^"]|\\")*)"$/]]></source>
             <target><![CDATA[/^la URL debe seguir el patrón "(?P<pattern>(?:[^"]|\\")*)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
diff --git a/i18n/fr.xliff b/i18n/fr.xliff
index f0d32ac..6171698 100644
--- a/i18n/fr.xliff
+++ b/i18n/fr.xliff
@@ -99,8 +99,8 @@
             <target><![CDATA[/^(?:|je )devrais être sur "(?P<page>[^"]+)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the url should match "(?P<pattern>(?:[^"]|\\")*)"$/]]></source>
-            <target><![CDATA[/^l'url devrait suivre le motif "(?P<pattern>(?:[^"]|\\")*)"$/]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match "(?P<pattern>(?:[^"]|\\")*)"$/]]></source>
+            <target><![CDATA[/^l'(?i)url(?-i) devrait suivre le motif "(?P<pattern>(?:[^"]|\\")*)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
             <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
diff --git a/i18n/ja.xliff b/i18n/ja.xliff
index 24f78c4..35b6247 100644
--- a/i18n/ja.xliff
+++ b/i18n/ja.xliff
@@ -99,8 +99,8 @@
             <target><![CDATA[/^(?:|ユーザーが )(?P<page>[^\s]+) を表示していること$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>\/([^\/]|\\\/)*\/)$/]]></source>
-            <target><![CDATA[/^(?i)url(?-i)が "(?P<pattern>\/([^\/]|\\\/)*\/)" にマッチすること$/]]></target>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^(?i)url(?-i)が (?P<pattern>"([^"]|\\")*") にマッチすること$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
             <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
diff --git a/i18n/nl.xliff b/i18n/nl.xliff
index 6723a4a..527590b 100644
--- a/i18n/nl.xliff
+++ b/i18n/nl.xliff
@@ -95,7 +95,7 @@
             <target><![CDATA[/^moet (?:|ik )op "(?P<page>[^"]+)" zijn$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the url should match "(?P<pattern>(?:[^"]|\\")*)"$/]]></source>
+            <source><![CDATA[/^the (?i)url(?-i) should match "(?P<pattern>(?:[^"]|\\")*)"$/]]></source>
             <target><![CDATA[/^moet de url overeenkomen met "(?P<pattern>(?:[^"]|\\")*)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
diff --git a/i18n/pl.xliff b/i18n/pl.xliff
index 7481f31..572bad6 100644
--- a/i18n/pl.xliff
+++ b/i18n/pl.xliff
@@ -99,7 +99,7 @@
             <target><![CDATA[/^(?:|że )powinienem być na stronie "(?P<page>[^"]+)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the url should match "(?P<pattern>(?:[^"]|\\")*)"$/]]></source>
+            <source><![CDATA[/^the (?i)url(?-i) should match "(?P<pattern>(?:[^"]|\\")*)"$/]]></source>
             <target><![CDATA[/^(?:url|adres) powinien odpowiadać "(?P<pattern>(?:[^"]|\\")*)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
diff --git a/i18n/pt.xliff b/i18n/pt.xliff
index 9193ce8..532eeeb 100644
--- a/i18n/pt.xliff
+++ b/i18n/pt.xliff
@@ -95,7 +95,7 @@
             <target><![CDATA[/^(?:|Eu )devo de estar em "(?P<page>[^"]+)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the url should match "(?P<pattern>(?:[^"]|\\")*)"$/]]></source>
+            <source><![CDATA[/^the (?i)url(?-i) should match "(?P<pattern>(?:[^"]|\\")*)"$/]]></source>
             <target><![CDATA[/^o endereço deve coincidir com "(?P<pattern>(?:[^"]|\\")*)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
diff --git a/i18n/ru.xliff b/i18n/ru.xliff
index 9111b1f..cc5102c 100644
--- a/i18n/ru.xliff
+++ b/i18n/ru.xliff
@@ -107,7 +107,7 @@
             <target><![CDATA[/^(?:|я )должен быть на странице "(?P<page>[^"]+)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>\/([^\/]|\\\/)*\/)$/]]></source>
+            <source><![CDATA[/^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/]]></source>
             <target><![CDATA[/^(?:url|адрес) должен соответствовать "(?P<pattern>(?:[^"]|\\")*)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
diff --git a/i18n/sv.xliff b/i18n/sv.xliff
index 58e0f9a..c2b0ba5 100644
--- a/i18n/sv.xliff
+++ b/i18n/sv.xliff
@@ -95,7 +95,7 @@
             <target><![CDATA[/^(?:|jag )skulle vara på "(?P<page>[^"]+)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-url-should-match">
-            <source><![CDATA[/^the url should match "(?P<pattern>(?:[^"]|\\")*)"$/]]></source>
+            <source><![CDATA[/^the (?i)url(?-i) should match "(?P<pattern>(?:[^"]|\\")*)"$/]]></source>
             <target><![CDATA[/^webbadressen skulle matcha "(?P<pattern>(?:[^"]|\\")*)"$/]]></target>
         </trans-unit>
         <trans-unit id="the-element-should-contain">
diff --git a/src/Behat/MinkExtension/Context/MinkContext.php b/src/Behat/MinkExtension/Context/MinkContext.php
index 0bbf7b6..80fad9e 100644
--- a/src/Behat/MinkExtension/Context/MinkContext.php
+++ b/src/Behat/MinkExtension/Context/MinkContext.php
@@ -186,7 +186,7 @@ class MinkContext extends RawMinkContext implements TranslatedContextInterface
     /**
      * Checks, that current page PATH matches regular expression.
      *
-     * @Then /^the (?i)url(?-i) should match (?P<pattern>\/([^\/]|\\\/)*\/)$/
+     * @Then /^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/
      */
     public function assertUrlRegExp($pattern)
     {
diff --git a/src/Behat/MinkExtension/Context/MinkDictionary.php b/src/Behat/MinkExtension/Context/MinkDictionary.php
index e492a08..b37cc44 100644
--- a/src/Behat/MinkExtension/Context/MinkDictionary.php
+++ b/src/Behat/MinkExtension/Context/MinkDictionary.php
@@ -254,7 +254,7 @@ trait MinkDictionary
     /**
      * Checks, that current page PATH matches regular expression.
      *
-     * @Then /^the (?i)url(?-i) should match (?P<pattern>\/([^\/]|\\\/)*\/)$/
+     * @Then /^the (?i)url(?-i) should match (?P<pattern>"([^"]|\\")*")$/
      */
     public function assertUrlRegExp($pattern)
     {