Merge branch 'wunit' (PR #8)

The pull request has been rebased before merging it. Closes #8

Author: stof

README.md

@@ -24,7 +24,6 @@ default:
       framework_script: ../../framework/yii.php
       config_script: ../config/test.php
       mink_driver: true
-      wunit: ~
 ```
 
 Installation

composer.json

@@ -14,7 +14,7 @@
 
     "require": {
         "php":          ">=5.3.2",
-        "behat/behat":  ">=2.4.0,<2.4.x-dev"
+        "behat/behat":  ">=2.4.1,<2.4.x-dev"
     },
 
     "autoload": {

src/Behat/YiiExtension/Context/Initializer/YiiAwareInitializer.php

@@ -28,7 +28,7 @@ class YiiAwareInitializer implements InitializerInterface
     /**
      * Initializes initializer.
      */
-    public function __construct($frameworkScript, $configScript)
+    public function __construct($frameworkScript, $configScript, $webApplicationFactory)
     {
         defined('YII_DEBUG') or define('YII_DEBUG', true);
         require_once($frameworkScript);
@@ -38,7 +38,7 @@ public function __construct($frameworkScript, $configScript)
         \YiiBase::$enableIncludePath = false;
 
         // create the application and remember it
-        $this->yii = \Yii::createWebApplication($configScript);
+        $this->yii = $webApplicationFactory::createWebApplication($configScript);
     }
 
     /**

src/Behat/YiiExtension/Extension.php

@@ -3,6 +3,7 @@
 namespace Behat\YiiExtension;
 
 use Symfony\Component\Config\FileLocator,
+    Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition,
     Symfony\Component\DependencyInjection\ContainerBuilder,
     Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 
@@ -34,27 +35,73 @@ public function load(array $config, ContainerBuilder $container)
     {
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/services'));
         $loader->load('yii.xml');
-        $configPath = $container->getParameter('behat.paths.base');
+        $basePath = $container->getParameter('behat.paths.base');
+
+        // starting from Behat 2.4.1, we can check for activated extensions
+        $extensions = $container->hasParameter('behat.extension.classes')
+                    ? $container->getParameter('behat.extension.classes')
+                    : array();
 
         if (!isset($config['framework_script'])) {
             throw new \InvalidArgumentException(
                 'Specify `framework_script` parameter for yii_extension.'
             );
         }
-        if (file_exists($cfg = $configPath.DIRECTORY_SEPARATOR.$config['framework_script'])) {
+        if (file_exists($cfg = $basePath.DIRECTORY_SEPARATOR.$config['framework_script'])) {
             $config['framework_script'] = $cfg;
         }
+        $container->setParameter('behat.yii_extension.framework_script', $config['framework_script']);
 
         if (!isset($config['config_script'])) {
             throw new \InvalidArgumentException(
                 'Specify `config_script` parameter for yii_extension.'
             );
         }
-        if (file_exists($cfg = $configPath.DIRECTORY_SEPARATOR.$config['config_script'])) {
+        if (file_exists($cfg = $basePath.DIRECTORY_SEPARATOR.$config['config_script'])) {
             $config['config_script'] = $cfg;
         }
-
-        $container->setParameter('behat.yii_extension.framework_script', $config['framework_script']);
         $container->setParameter('behat.yii_extension.config_script', $config['config_script']);
+
+        if ($config['mink_driver']) {
+            if (!class_exists('Behat\\Mink\\Driver\\WUnitDriver')) {
+                throw new \RuntimeException(
+                    'Install WUnitDriver in order to activate wunit session.'
+                );
+            }
+
+            $loader->load('sessions/wunit.xml');
+        } elseif (in_array('Behat\\MinkExtension\\Extension', $extensions) && class_exists('Behat\\Mink\\Driver\\WUnitDriver')) {
+            $loader->load('sessions/wunit.xml');
+        }
+    }
+
+    /**
+     * Setups configuration for current extension.
+     *
+     * @param ArrayNodeDefinition $builder
+     */
+    public function getConfig(ArrayNodeDefinition $builder)
+    {
+        $boolFilter = function ($v) {
+            $filtered = filter_var($v, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+            return (null === $filtered) ? $v : $filtered;
+        };
+
+        $builder->
+            children()->
+                scalarNode('framework_script')->
+                    isRequired()->
+                end()->
+                scalarNode('config_script')->
+                    isRequired()->
+                end()->
+                booleanNode('mink_driver')->
+                    beforeNormalization()->
+                        ifString()->then($boolFilter)->
+                    end()->
+                    defaultFalse()->
+                end()->
+            end()
+        ;
     }
 }

src/Behat/YiiExtension/services/sessions/wunit.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <parameters>
+
+        <parameter key="behat.mink.driver.wunit.class">Behat\Mink\Driver\WUnitDriver</parameter>
+        <parameter key="behat.yii_extension.web_application_factory">\WUnit\WUnit</parameter>
+
+    </parameters>
+    <services>
+
+        <service id="behat.mink.session.wunit" class="%behat.mink.session.class%">
+            <argument type="service">
+                <service class="%behat.mink.driver.wunit.class%">
+                </service>
+            </argument>
+            <argument type="service" id="behat.mink.selector.handler" />
+            <tag name="behat.mink.session" alias="wunit" />
+        </service>
+
+    </services>
+</container>

src/Behat/YiiExtension/services/yii.xml

@@ -7,13 +7,15 @@
         <parameter key="behat.yii_extension.context.initializer.class">Behat\YiiExtension\Context\Initializer\YiiAwareInitializer</parameter>
         <parameter key="behat.yii_extension.framework_script"></parameter>
         <parameter key="behat.yii_extension.config_script"></parameter>
+        <parameter key="behat.yii_extension.web_application_factory">\Yii</parameter>
 
     </parameters>
     <services>
 
         <service id="behat.yii_extension.context.initializer" class="%behat.yii_extension.context.initializer.class%">
             <argument>%behat.yii_extension.framework_script%</argument>
             <argument>%behat.yii_extension.config_script%</argument>
+            <argument>%behat.yii_extension.web_application_factory%</argument>
             <tag name="behat.context.initializer" />
         </service>