Clean up behat scenarios

Author: wouterj

Tests/Features/Context/ResourceContext.php

@@ -17,6 +17,9 @@ class ResourceContext implements Context, KernelAwareContext
 {
     private $session;
     private $manager;
+    /**
+     * @var KernelInterface
+     */
     private $kernel;
 
     /**
@@ -61,7 +64,7 @@ public function beforeScenario(BeforeScenarioScope $scope)
     /**
      * @Given the test application has the following configuration:
      */
-    public function givenTheApplicationHasTheConfiguration(PyStringNode $config)
+    public function setApplicationConfig(PyStringNode $config)
     {
         file_put_contents(self::getConfigurationFile(), $config->getRaw());
     }
@@ -79,9 +82,9 @@ public function createFile($filename, PyStringNode $content)
     }
 
     /**
-     * @Given there exists a ":class" document at ":path":
+     * @Given there exists a :class document at :path:
      */
-    public function givenThereExistsDocument($class, $path, TableNode $fields)
+    public function createDocument($class, $path, TableNode $fields)
     {
         $class = 'Symfony\\Cmf\\Bundle\\ResourceRestBundle\\Tests\\Resources\\TestBundle\\Document\\' . $class;
         $path = '/tests' . $path;

Tests/Features/resource_api_phpcr.feature

@@ -24,9 +24,8 @@ Feature: PHPCR resource repository
         Given there exists a "Article" document at "/cmf/articles/foo":
             | title | Article 1 |
             | body | This is my article |
-        Then I send a GET request to "/api/phpcr_repo/foo"
-        And print response
-        And the response should contain json:
+        When I send a GET request to "/api/phpcr_repo/foo"
+        Then the response should contain json:
             """
             {
                 "repository_alias": "phpcr_repo",

Tests/Features/resource_api_phpcr_odm.feature

@@ -14,7 +14,7 @@ Feature: PHPCR-ODM resource repository
 
             cmf_resource_rest:
                 payload_alias_map:
-                    article: 
+                    article:
                         repository: doctrine_phpcr_odm
                         type: "Symfony\\Cmf\\Bundle\\ResourceRestBundle\\Tests\\Resources\\TestBundle\\Document\\Article"
             """
@@ -24,9 +24,8 @@ Feature: PHPCR-ODM resource repository
         Given there exists a "Article" document at "/cmf/articles/foo":
             | title | Article 1 |
             | body | This is my article |
-        Then I send a GET request to "/api/phpcrodm_repo/foo"
-        And print response
-        And the response code should be 200
+        When I send a GET request to "/api/phpcrodm_repo/foo"
+        Then the response code should be 200
         And the response should contain json:
             """
             {
@@ -52,9 +51,8 @@ Feature: PHPCR-ODM resource repository
         And there exists a "Article" document at "/cmf/articles/foo/boo":
             | title | Article child |
             | body | But this one is mine |
-        Then I send a GET request to "/api/phpcrodm_repo/foo"
-        And print response
-        And the response code should be 200
+        When I send a GET request to "/api/phpcrodm_repo/foo"
+        Then the response code should be 200
         And the response should contain json:
             """
             {