Merge branch '1.3' into 2.0

Conflicts: src/Behat/MinkExtension/Context/MinkDictionary.php
2014-04-27 14:04:32 +02:00
parent b376c01e95 0642b680b6
commit a8d05cd478
16 changed files with 33 additions and 33 deletions
--- a/src/Behat/MinkExtension/Context/MinkContext.php
+++ b/src/Behat/MinkExtension/Context/MinkContext.php
@@ -209,7 +209,7 @@ class MinkContext extends RawMinkContext implements TranslatableContext
    /**
     * 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)
    {