From ca0657d047b0c89faceb505205da3c4328aee654 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Sat, 4 Jan 2014 15:59:03 +0100 Subject: [PATCH 1/2] Fixed the requirement Behat version in the doc --- doc/index.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/index.rst b/doc/index.rst index b7bcd19..7848723 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -9,7 +9,7 @@ and languages provide functional testing tools. Today we’ll talk about how to use Behat for functional testing of web applications. `Mink `_ is a tool exactly for that and this extension provides integration for it. -Basically, MinkExtension is an integration layer between Behat 2.4+ and Mink 1.4+ +Basically, MinkExtension is an integration layer between Behat 2.5 and Mink 1.4+ and it provides: * Additional services for Behat (``Mink``, ``Sessions``, ``Drivers``). @@ -24,7 +24,7 @@ Installation This extension requires: -* Behat 2.4+ +* Behat 2.5 * Mink 1.4+ Through PHAR @@ -37,7 +37,7 @@ You should first download 3 phar archives: * `mink_extension.phar `_ - integration extension -After downloading and placing them into project directory, you need to +After downloading and placing them into project directory, you need to activate ``mink_extension.phar`` in your ``behat.yml``: .. code-block:: yaml @@ -226,12 +226,12 @@ with support for 5 drivers out of the box: goutte: ~ .. Tips : HTTPS and self-signed certificate -In case you use Behat/Mink/Goutte to test your application, and want to test an -application secured with HTTPS, but with a self-signed certificate, you can use +In case you use Behat/Mink/Goutte to test your application, and want to test an +application secured with HTTPS, but with a self-signed certificate, you can use the following parameters to avoid the validation error triggered by Guzzle : .. code-block:: yaml - + default: extensions: Behat\MinkExtension\Extension: From e968ca24a4c3240a7f185309e32f76b958b5a2c9 Mon Sep 17 00:00:00 2001 From: Nimothenicefish Date: Fri, 24 Jan 2014 12:23:17 +0100 Subject: [PATCH 2/2] Update the fr translation - add step for verify the element should not contain --- i18n/fr.xliff | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/i18n/fr.xliff b/i18n/fr.xliff index 9d92b7f..5b6e3f0 100644 --- a/i18n/fr.xliff +++ b/i18n/fr.xliff @@ -126,6 +126,10 @@ [^"]*)" element should contain "(?P(?:[^"]|\\")*)"$/]]> [^"]*)" devrait contenir "(?P(?:[^"]|\\")*)"$/]]> + + [^"]*)" element should not contain "(?P(?:[^"]|\\")*)"$/]]> + [^"]*)" ne devrait pas contenir "(?P(?:[^"]|\\")*)"$/]]> + (?:[^"]|\\")*)" in the "(?P[^"]*)" element$/]]> (?:[^"]|\\")*)" dans l'élément "(?P[^"]*)"$/]]>