Merge pull request #1 from stof/url_match_regex

Changed the regex delimiter for "The url should match"
2012-05-11 14:39:52 -07:00
parent e959b597f5 bab40334b6
commit 1bbccad801
12 changed files with 30 additions and 22 deletions
--- a/i18n/cs.xliff
+++ b/i18n/cs.xliff
@@ -99,8 +99,8 @@
            <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>
-            <target><![CDATA[/^(?:url|adresa|url adresa) musí mít tvar "(?P<pattern>(?:[^"]|\\")*)"$/]]></target>
+            <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">
            <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
--- a/i18n/de.xliff
+++ b/i18n/de.xliff
@@ -99,8 +99,8 @@
            <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>
-            <target><![CDATA[/^die Webadresse sollte mit "(?P<pattern>(?:[^"]|\\")*)" übereinstimmen$/]]></target>
+            <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">
            <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
--- a/i18n/es.xliff
+++ b/i18n/es.xliff
@@ -99,8 +99,8 @@
            <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>
-            <target><![CDATA[/^la URL debe seguir el patrón "(?P<pattern>(?:[^"]|\\")*)"$/]]></target>
+            <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">
            <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
--- a/i18n/fr.xliff
+++ b/i18n/fr.xliff
@@ -66,6 +66,14 @@
            <source><![CDATA[/^(?:|I )should see "(?P<text>(?:[^"]|\\")*)"$/]]></source>
            <target><![CDATA[/^(?:|je )devrais voir "(?P<text>(?:[^"]|\\")*)"$/]]></target>
        </trans-unit>
+        <trans-unit id="i-should-see-text-matching">
+            <source><![CDATA[/^(?:|I )should see text matching (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^(?:|je )devrais voir un texte suivant le motif (?P<pattern>"(?:[^"]|\\")*")$/]]></target>
+        </trans-unit>
+        <trans-unit id="i-should-not-see-text-matching">
+            <source><![CDATA[/^(?:|I )should not see text matching (?P<pattern>"(?:[^"]|\\")*")$/]]></source>
+            <target><![CDATA[/^(?:|je )ne devrais pas voir de texte suivant le motif (?P<pattern>"(?:[^"]|\\")*")$/]]></target>
+        </trans-unit>
        <trans-unit id="the-response-should-contain">
            <source><![CDATA[/^the response should contain "(?P<text>(?:[^"]|\\")*)"$/]]></source>
            <target><![CDATA[/^la réponse devrait contenir "(?P<text>(?:[^"]|\\")*)"$/]]></target>
@@ -99,8 +107,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>
--- 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>
--- a/i18n/nl.xliff
+++ b/i18n/nl.xliff
@@ -95,8 +95,8 @@
            <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>
-            <target><![CDATA[/^moet de url overeenkomen met "(?P<pattern>(?:[^"]|\\")*)"$/]]></target>
+            <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">
            <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
--- a/i18n/pl.xliff
+++ b/i18n/pl.xliff
@@ -99,8 +99,8 @@
            <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>
-            <target><![CDATA[/^(?:url|adres) powinien odpowiadać "(?P<pattern>(?:[^"]|\\")*)"$/]]></target>
+            <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">
            <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
--- a/i18n/pt.xliff
+++ b/i18n/pt.xliff
@@ -95,8 +95,8 @@
            <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>
-            <target><![CDATA[/^o endereço deve coincidir com "(?P<pattern>(?:[^"]|\\")*)"$/]]></target>
+            <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">
            <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
--- a/i18n/ru.xliff
+++ b/i18n/ru.xliff
@@ -107,8 +107,8 @@
            <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>
-            <target><![CDATA[/^(?:url|адрес) должен соответствовать "(?P<pattern>(?:[^"]|\\")*)"$/]]></target>
+            <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">
            <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
--- a/i18n/sv.xliff
+++ b/i18n/sv.xliff
@@ -95,8 +95,8 @@
            <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>
-            <target><![CDATA[/^webbadressen skulle matcha "(?P<pattern>(?:[^"]|\\")*)"$/]]></target>
+            <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">
            <source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
--- 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)
    {
--- 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)
    {