Made behat tests more stable

Author: dantleech

Tests/Features/resource_api_phpcr.feature

@@ -10,7 +10,7 @@ Feature: Request Resources from the REST API
                 repository:
                     doctrine_phpcr:
                         phpcr_repo:
-                        basepath: /tests/cmf/articles
+                            basepath: /tests/cmf/articles
 
 
 

Tests/Features/resource_api_phpcr_odm.feature

@@ -13,7 +13,7 @@ Feature: Request Resources from the REST API
                             basepath: /tests/cmf/articles
 
             cmf_resource_rest:
-                payload_alias:
+                payload_alias_map:
                     article: { repository: doctrine_phpcr_odm, type: "Symfony\Cmf\Bundle\ResourceRestBundle\Tests\Resources\TestBundle\Document\Article" }
             """
 

Tests/Resources/app/AppKernel.php

@@ -2,12 +2,19 @@
 
 use Symfony\Cmf\Component\Testing\HttpKernel\TestKernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Cmf\Bundle\ResourceRestBundle\Tests\Features\Context\ResourceContext;
 
 /**
  * This is the kernel used by the application being tested
  */
 class AppKernel extends TestKernel
 {
+    private $configPath;
+
+    public function setConfig($configPath)
+    {
+        $this->config = $configPath;
+    }
     public function configure()
     {
         $this->requireBundleSets(array(
@@ -26,5 +33,9 @@ public function configure()
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load(__DIR__.'/config/config.php');
+
+        if ($this->getEnvironment() !== 'behat') {
+            $loader->import(ResourceContext::getConfigurationFile());
+        }
     }
 }

Tests/Resources/app/config/config.php

@@ -8,7 +8,3 @@
 $loader->import(CMF_TEST_CONFIG_DIR.'/dist/monolog.yml');
 $loader->import(CMF_TEST_CONFIG_DIR.'/dist/doctrine.yml');
 $loader->import(CMF_TEST_CONFIG_DIR.'/phpcr_odm.php');
-
-if (file_exists(ResourceContext::getConfigurationFile())) {
-    $loader->import(ResourceContext::getConfigurationFile());
-}

behat.yml

@@ -10,6 +10,7 @@ default:
         Behat\Symfony2Extension:
             kernel:
                 path: Tests/Resources/app/AppKernel.php
+                env: behat
                 bootstrap: vendor/symfony-cmf/testing/bootstrap/bootstrap.php
         Behat\WebApiExtension:
             base_url: http://localhost:8000/