veyra/friends-of-behat-mink-extension
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #111 from docteurklein/3.0

Browse Source 
make it compatible with behat v3
This commit is contained in:
Christophe Coevoet
2013-10-29 06:31:31 -07:00
parent 253d919b42 2ebc88634b
commit e58a570e59
7 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
behat.yml.dist
View File

@@ -1,4 +1,8 @@
default: default:
suites:
default:
path: %paths.base%/features
context: Behat\MinkExtension\Context\MinkContext
extensions: extensions:
Behat\MinkExtension\Extension: Behat\MinkExtension\Extension:
base_url: http://en.wikipedia.org/ base_url: http://en.wikipedia.org/

2
composer.json
View File

@@ -14,7 +14,7 @@
"require": { "require": {
"php": ">=5.3.2", "php": ">=5.3.2",
"behat/behat": "~2.5.0", "behat/behat": "~3@dev",
"behat/mink": ">=1.4.3,<1.6-dev", "behat/mink": ">=1.4.3,<1.6-dev",
"symfony/config": "~2.2" "symfony/config": "~2.2"
}, },

10
src/Behat/MinkExtension/Context/MinkContext.php
View File

@@ -4,7 +4,7 @@ namespace Behat\MinkExtension\Context;
use Behat\Gherkin\Node\TableNode; use Behat\Gherkin\Node\TableNode;
use Behat\Behat\Context\TranslatedContextInterface, use Behat\Behat\Context\TranslatableContextInterface,
Behat\Behat\Event\ScenarioEvent; Behat\Behat\Event\ScenarioEvent;
/* /*
@@ -21,7 +21,7 @@ use Behat\Behat\Context\TranslatedContextInterface,
* *
* @author Konstantin Kudryashov <ever.zet@gmail.com> * @author Konstantin Kudryashov <ever.zet@gmail.com>
*/ */
class MinkContext extends RawMinkContext implements TranslatedContextInterface class MinkContext extends RawMinkContext implements TranslatableContextInterface
{ {
/** /**
* Opens homepage. * Opens homepage.
@@ -459,9 +459,9 @@ class MinkContext extends RawMinkContext implements TranslatedContextInterface
* *
* @return array * @return array
*/ */
public function getTranslationResources() public static function getTranslationResources()
{ {
return $this->getMinkTranslationResources(); return self::getMinkTranslationResources();
} }
/** /**
@@ -469,7 +469,7 @@ class MinkContext extends RawMinkContext implements TranslatedContextInterface
* *
* @return array * @return array
*/ */
public function getMinkTranslationResources() public static function getMinkTranslationResources()
{ {
return glob(__DIR__.'/../../../../i18n/*.xliff'); return glob(__DIR__.'/../../../../i18n/*.xliff');
} }

2
src/Behat/MinkExtension/Context/MinkDictionary.php
View File

@@ -547,7 +547,7 @@ trait MinkDictionary
* *
* @return array * @return array
*/ */
public function getMinkTranslationResources() public static function getMinkTranslationResources()
{ {
return glob(__DIR__.'/../../../../i18n/*.xliff'); return glob(__DIR__.'/../../../../i18n/*.xliff');
} }

4
src/Behat/MinkExtension/Context/RawMinkContext.php
View File

@@ -2,7 +2,7 @@
namespace Behat\MinkExtension\Context; namespace Behat\MinkExtension\Context;
use Behat\Behat\Context\BehatContext; use Behat\Behat\Context\ContextInterface;
use Behat\Mink\Mink, use Behat\Mink\Mink,
Behat\Mink\WebAssert, Behat\Mink\WebAssert,
@@ -22,7 +22,7 @@ use Behat\Mink\Mink,
* *
* @author Konstantin Kudryashov <ever.zet@gmail.com> * @author Konstantin Kudryashov <ever.zet@gmail.com>
*/ */
class RawMinkContext extends BehatContext implements MinkAwareInterface class RawMinkContext implements MinkAwareInterface, ContextInterface
{ {
private $mink; private $mink;
private $minkParameters; private $minkParameters;

5
src/Behat/MinkExtension/Extension.php
View File

@@ -427,4 +427,9 @@ class Extension implements ExtensionInterface
return $config; return $config;
} }
public function getName()
{
return 'mink';
}
} }

2
src/Behat/MinkExtension/services/core.xml
View File

@@ -43,7 +43,7 @@
<service id="behat.mink.context.initializer" class="%behat.mink.context.initializer.class%"> <service id="behat.mink.context.initializer" class="%behat.mink.context.initializer.class%">
<argument type="service" id="behat.mink" /> <argument type="service" id="behat.mink" />
<argument>%behat.mink.parameters%</argument> <argument>%behat.mink.parameters%</argument>
<tag name="behat.context.initializer" /> <tag name="context.initializer" />
</service> </service>
<service id="behat.mink.listener.sessions_listener" class="%behat.mink.listener.sessions_listener.class%"> <service id="behat.mink.listener.sessions_listener" class="%behat.mink.listener.sessions_listener.class%">