Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'develop' of github.com:Behat/Mink into develop

  • Loading branch information...
commit cbe915ba59ed86bcddc5f5d07f90af200e80dd6f 2 parents ea72e82 + 0a2928b
@everzet everzet authored
View
22 src/Behat/Mink/Behat/Context/translations/es.xliff
@@ -46,6 +46,10 @@
<source><![CDATA[/^(?:|I )select "(?P<option>(?:[^"]|\\")*)" from "(?P<select>(?:[^"]|\\")*)"$/]]></source>
<target><![CDATA[/^(?:|Yo )selecciono "(?P<option>(?:[^"]|\\")*)" desde "(?P<select>(?:[^"]|\\")*)"$/]]></target>
</trans-unit>
+ <trans-unit id="i-additionally-select-option-from-select">
+ <source><![CDATA[/^(?:|I )additionally select "(?P<option>(?:[^"]|\\")*)" from "(?P<select>(?:[^"]|\\")*)"$/]]></source>
+ <target><![CDATA[/^(?:|Yo )adicionalmente selecciono "(?P<option>(?:[^"]|\\")*)" desde "(?P<select>(?:[^"]|\\")*)"$/]]></target>
+ </trans-unit>
<trans-unit id="i-check-option">
<source><![CDATA[/^(?:|I )check "(?P<option>(?:[^"]|\\")*)"$/]]></source>
<target><![CDATA[/^(?:|Yo )chequeo "(?P<option>(?:[^"]|\\")*)"$/]]></target>
@@ -62,14 +66,14 @@
<source><![CDATA[/^(?:|I )should see "(?P<text>(?:[^"]|\\")*)"$/]]></source>
<target><![CDATA[/^(?:|Yo )debo ver "(?P<text>(?:[^"]|\\")*)"$/]]></target>
</trans-unit>
- <trans-unit id="the-response-should-contain">
- <source><![CDATA[/^the response should contain "(?P<text>(?:[^"]|\\")*)"$/]]></source>
- <target><![CDATA[/^la respuesta debe contener "(?P<text>(?:[^"]|\\")*)"$/]]></target>
- </trans-unit>
<trans-unit id="i-should-not-see-text">
<source><![CDATA[/^(?:|I )should not see "(?P<text>(?:[^"]|\\")*)"$/]]></source>
<target><![CDATA[/^(?:|Yo )no debo ver "(?P<text>(?:[^"]|\\")*)"$/]]></target>
</trans-unit>
+ <trans-unit id="the-response-should-contain">
+ <source><![CDATA[/^the response should contain "(?P<text>(?:[^"]|\\")*)"$/]]></source>
+ <target><![CDATA[/^la respuesta debe contener "(?P<text>(?:[^"]|\\")*)"$/]]></target>
+ </trans-unit>
<trans-unit id="the-response-should-not-contain">
<source><![CDATA[/^the response should not contain "(?P<text>(?:[^"]|\\")*)"$/]]></source>
<target><![CDATA[/^la respuesta no debe contener "(?P<text>(?:[^"]|\\")*)"$/]]></target>
@@ -114,9 +118,17 @@
<source><![CDATA[/^(?:|I )should not see an? "(?P<element>[^"]*)" element$/]]></source>
<target><![CDATA[/^(?:|Yo )no debo ver un elemento "(?P<element>[^"]*)"$/]]></target>
</trans-unit>
+ <trans-unit id="i-should-see-num-elements">
+ <source><![CDATA[/^(?:|I )should see (?P<num>\d+) "(?P<element>[^"]*)" elements?$/]]></source>
+ <target><![CDATA[/^(?:|Yo )debo ver (?P<num>\d+) "(?P<element>[^"]*)" elementos$/]]></target>
+ </trans-unit>
<trans-unit id="the-response-status-code-should-be">
<source><![CDATA[/^the response status code should be (?P<code>\d+)$/]]></source>
- <target><![CDATA[/^el código de estado de la respuesta deve ser (?P<code>\d+)$/]]></target>
+ <target><![CDATA[/^el código de estado de la respuesta debe ser (?P<code>\d+)$/]]></target>
+ </trans-unit>
+ <trans-unit id="the-response-status-code-should-not-be">
+ <source><![CDATA[/^the response status code should not be (?P<code>\d+)$/]]></source>
+ <target><![CDATA[/^el código de estado de la respuesta no debe ser (?P<code>\d+)$/]]></target>
</trans-unit>
<trans-unit id="print-last-response">
<source><![CDATA[/^print last response$/]]></source>
View
80 src/Behat/Mink/Behat/Context/translations/fr.xliff
@@ -3,12 +3,24 @@
<header />
<body>
<trans-unit id="i-am-on-page">
- <source><![CDATA[/^(?:|I )am on (?P<page>.+)$/]]></source>
- <target><![CDATA[/^(?:|je )suis sur (?P<page>.+)$/]]></target>
+ <source><![CDATA[/^(?:|I )am on "(?P<page>[^"]+)"$/]]></source>
+ <target><![CDATA[/^(?:|je )suis sur "(?P<page>[^"]+)"$/]]></target>
</trans-unit>
<trans-unit id="i-go-to-page">
- <source><![CDATA[/^(?:|I )go to (?P<page>.+)$/]]></source>
- <target><![CDATA[/^(?:|je )vais sur (?P<page>.+)$/]]></target>
+ <source><![CDATA[/^(?:|I )go to "(?P<page>[^"]+)"$/]]></source>
+ <target><![CDATA[/^(?:|je )vais sur "(?P<page>[^"]+)"$/]]></target>
+ </trans-unit>
+ <trans-unit id="reload-the-page">
+ <source><![CDATA[/^(?:|I )reload the page$/]]></source>
+ <target><![CDATA[/^(?:|je )recharge la page$/]]></target>
+ </trans-unit>
+ <trans-unit id="move-backward-one-page">
+ <source><![CDATA[/^(?:|I )move backward one page$/]]></source>
+ <target><![CDATA[/^(?:|je )recule d'une page$/]]></target>
+ </trans-unit>
+ <trans-unit id="move-forward-one-page">
+ <source><![CDATA[/^(?:|I )move forward one page$/]]></source>
+ <target><![CDATA[/^(?:|j')avance d'une page$/]]></target>
</trans-unit>
<trans-unit id="i-press-button">
<source><![CDATA[/^(?:|I )press "(?P<button>(?:[^"]|\\")*)"$/]]></source>
@@ -34,6 +46,10 @@
<source><![CDATA[/^(?:|I )select "(?P<option>(?:[^"]|\\")*)" from "(?P<select>(?:[^"]|\\")*)"$/]]></source>
<target><![CDATA[/^(?:|je )sélectionne "(?P<option>(?:[^"]|\\")*)" depuis "(?P<select>(?:[^"]|\\")*)"$/]]></target>
</trans-unit>
+ <trans-unit id="i-additionally-select-option-from-select">
+ <source><![CDATA[/^(?:|I )additionally select "(?P<option>(?:[^"]|\\")*)" from "(?P<select>(?:[^"]|\\")*)"$/]]></source>
+ <target><![CDATA[/^(?:|je )sélectionne une autre option "(?P<option>(?:[^"]|\\")*)" depuis "(?P<select>(?:[^"]|\\")*)"$/]]></target>
+ </trans-unit>
<trans-unit id="i-check-option">
<source><![CDATA[/^(?:|I )check "(?P<option>(?:[^"]|\\")*)"$/]]></source>
<target><![CDATA[/^(?:|je )coche "(?P<option>(?:[^"]|\\")*)"$/]]></target>
@@ -50,10 +66,18 @@
<source><![CDATA[/^(?:|I )should see "(?P<text>(?:[^"]|\\")*)"$/]]></source>
<target><![CDATA[/^(?:|je )devrais voir "(?P<text>(?:[^"]|\\")*)"$/]]></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>
+ </trans-unit>
<trans-unit id="i-should-not-see-text">
<source><![CDATA[/^(?:|I )should not see "(?P<text>(?:[^"]|\\")*)"$/]]></source>
<target><![CDATA[/^(?:|je )ne devrais pas voir "(?P<text>(?:[^"]|\\")*)"$/]]></target>
</trans-unit>
+ <trans-unit id="the-response-should-not-contain">
+ <source><![CDATA[/^the response should not contain "(?P<text>(?:[^"]|\\")*)"$/]]></source>
+ <target><![CDATA[/^la réponse ne devrait pas contenir "(?P<text>(?:[^"]|\\")*)"$/]]></target>
+ </trans-unit>
<trans-unit id="the-field-should-contain-value">
<source><![CDATA[/^the "(?P<field>(?:[^"]|\\")*)" field should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
<target><![CDATA[/^le champ "(?P<field>(?:[^"]|\\")*)" devrait contenir "(?P<value>(?:[^"]|\\")*)"$/]]></target>
@@ -64,35 +88,55 @@
</trans-unit>
<trans-unit id="the-checkbox-should-be-checked">
<source><![CDATA[/^the "(?P<checkbox>(?:[^"]|\\")*)" checkbox should be checked$/]]></source>
- <target><![CDATA[/^la case à cocher "(?P<checkbox>[^"]*) devrait être cochée" $/]]></target>
+ <target><![CDATA[/^la case à cocher "(?P<checkbox>[^"]*)" devrait être cochée$/]]></target>
</trans-unit>
<trans-unit id="the-checkbox-should-not-be-checked">
<source><![CDATA[/^the "(?P<checkbox>(?:[^"]|\\")*)" checkbox should not be checked$/]]></source>
<target><![CDATA[/^la case à cocher "(?P<checkbox>(?:[^"]|\\")*)" ne devrait pas être cochée$/]]></target>
</trans-unit>
<trans-unit id="i-should-be-on-page">
- <source><![CDATA[/^(?:|I )should be on (?P<page>.+)$/]]></source>
- <target><![CDATA[/^(?:|je )devrais être sur (?P<page>.+)$/]]></target>
+ <source><![CDATA[/^(?:|I )should be on "(?P<page>[^"]+)"$/]]></source>
+ <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>
</trans-unit>
<trans-unit id="the-element-should-contain">
<source><![CDATA[/^the "(?P<element>[^"]*)" element should contain "(?P<value>(?:[^"]|\\")*)"$/]]></source>
- <target><![CDATA[/^l'élement "(?P<element>[^"]*)" devrait contenir "(?P<value>(?:[^"]|\\")*)"$/]]></target>
+ <target><![CDATA[/^l'élément "(?P<element>[^"]*)" devrait contenir "(?P<value>(?:[^"]|\\")*)"$/]]></target>
+ </trans-unit>
+ <trans-unit id="i-should-see-text-in-element">
+ <source><![CDATA[/^(?:|I )should see "(?P<text>(?:[^"]|\\")*)" in the "(?P<element>[^"]*)" element$/]]></source>
+ <target><![CDATA[/^(?:|je )devrais voir "(?P<text>(?:[^"]|\\")*)" dans l'élément "(?P<element>[^"]*)"$/]]></target>
</trans-unit>
<trans-unit id="i-should-see-element">
<source><![CDATA[/^(?:|I )should see an? "(?P<element>[^"]*)" element$/]]></source>
- <target><![CDATA[/^(?:|je )devrais voir l'élement "(?P<element>[^"]*)"$/]]></target>
+ <target><![CDATA[/^(?:|je )devrais voir l'élément "(?P<element>[^"]*)"$/]]></target>
+ </trans-unit>
+ <trans-unit id="i-should-not-see-element">
+ <source><![CDATA[/^(?:|I )should not see an? "(?P<element>[^"]*)" element$/]]></source>
+ <target><![CDATA[/^(?:|je )ne devrais pas voir l'élément "(?P<element>[^"]*)"$/]]></target>
+ </trans-unit>
+ <trans-unit id="i-should-see-num-elements">
+ <source><![CDATA[/^(?:|I )should see (?P<num>\d+) "(?P<element>[^"]*)" elements?$/]]></source>
+ <target><![CDATA[/^(?:|je )devrais voir (?P<num>\d+) éléments? "(?P<element>[^"]*)"$/]]></target>
+ </trans-unit>
+ <trans-unit id="the-response-status-code-should-be">
+ <source><![CDATA[/^the response status code should be (?P<code>\d+)$/]]></source>
+ <target><![CDATA[/^le code de status de la réponse devrait être (?P<code>\d+)$/]]></target>
</trans-unit>
- <trans-unit id="the-element-should-link-to">
- <source><![CDATA[/^the "(?P<element>[^"]*)" element should link to (?P<href>.*)$/]]></source>
- <target><![CDATA[/^l'élement "(?P<element>[^"]*)" devrait pointer vers (?P<href>.*)$/]]></target>
+ <trans-unit id="the-response-status-code-should-not-be">
+ <source><![CDATA[/^the response status code should not be (?P<code>\d+)$/]]></source>
+ <target><![CDATA[/^le code de status de la réponse ne devrait pas être (?P<code>\d+)$/]]></target>
</trans-unit>
- <trans-unit id="the-element-should-have-attribute-of">
- <source><![CDATA[/^the "(?P<element>[^"]*)" element should have a "(?P<attribute>[a-zA-Z\-\_]*)" attribute of "(?P<value>(?:[^"]|\\")*)"$/]]></source>
- <target><![CDATA[/^l'élement "(?P<element>[^"]*)" devrait avoir un attribut "(?P<attribute>[a-zA-Z\-\_]*)" de valeur "(?P<value>(?:[^"]|\\")*)"$/]]></target>
+ <trans-unit id="print-last-response">
+ <source><![CDATA[/^print last response$/]]></source>
+ <target><![CDATA[/^imprimer la dernière réponse$/]]></target>
</trans-unit>
- <trans-unit id="">
- <source><![CDATA[/the response status code should be (?P<code>\d+)/]]></source>
- <target><![CDATA[/le code du statut de la réponse devrait être (?P<code>\d+)/]]></target>
+ <trans-unit id="show-last-response">
+ <source><![CDATA[/^show last response$/]]></source>
+ <target><![CDATA[/^montrer la dernière réponse$/]]></target>
</trans-unit>
</body>
</file>
View
6 src/Behat/Mink/Driver/SeleniumDriver.php
@@ -122,11 +122,7 @@ public function stop()
*/
public function reset()
{
- try {
- $this->executeScript(
- '(function(){var c=document.cookie.split(";");for(var i=0;i<c.length;i++){var e=c[i].indexOf("=");var n=e>-1?c[i].substr(0,e):c[i];document.cookie=n+"=;expires=Thu, 01 Jan 1970 00:00:00 GMT";}})()'
- );
- } catch(\Exception $e) {}
+ $this->browser->deleteAllVisibleCookies();
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.