Merge pull request #1510 from dunglas/fix_3.4

Make tests green when using SF 3.4

Author: dunglas

.travis.yml

@@ -41,7 +41,8 @@ install:
 
 script:
   - vendor/bin/phpunit
-  - vendor/bin/behat --format=progress
+  - if [[ $deps = 'beta' ]]; then vendor/bin/behat --format=progress --tags='~@nobeta'; fi
+  - if [[ $deps != 'beta' ]]; then vendor/bin/behat --format=progress; fi
   - tests/Fixtures/app/console api:swagger:export > swagger.json && swagger-cli validate swagger.json && rm swagger.json
   - if [[ $lint = 1 ]]; then php php-cs-fixer.phar fix --dry-run --diff --no-ansi; fi
   - if [[ $lint = 1 ]]; then phpstan analyse -c phpstan.neon -l5 --ansi src tests; fi

composer.json

@@ -31,7 +31,7 @@
         "behat/mink-browserkit-driver": "^1.3.1",
         "behat/mink-extension": "^2.2",
         "behat/symfony2-extension": "^2.1.1",
-        "behatch/contexts": "^2.6",
+        "behatch/contexts": "dev-master",
         "doctrine/doctrine-bundle": "^1.6.3",
         "doctrine/orm": "^2.5.2",
         "doctrine/annotations": "^1.2",
@@ -49,7 +49,7 @@
         "symfony/config": "^3.3 || ^4.0",
         "symfony/console": "^3.3 || ^4.0",
         "symfony/debug": "^2.8 || ^3.0 || ^4.0",
-        "symfony/dependency-injection": "^3.3 || ^4.0",
+        "symfony/dependency-injection": "^3.3@dev || ^4.0@dev",
         "symfony/doctrine-bridge": "^2.8 || ^3.0 || ^4.0",
         "symfony/event-dispatcher": "^3.3 || ^4.0",
         "symfony/expression-language": "^2.8 || ^3.0 || ^4.0",

features/bootstrap/FeatureContext.php

@@ -42,6 +42,7 @@
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\UuidIdentifierDummy;
 use Behat\Behat\Context\Context;
 use Behat\Behat\Context\SnippetAcceptingContext;
+use Behat\Behat\Hook\Scope\AfterStepScope;
 use Behatch\HttpCall\Request;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityManagerInterface;
@@ -77,12 +78,24 @@ public function __construct(ManagerRegistry $doctrine, Request $request)
         $this->request = $request;
     }
 
+    /**
+     * Sets the default Accept HTTP header to null (workaround to artificially remove it).
+     *
+     * @AfterStep
+     */
+    public function removeAcceptHeaderAfterRequest(AfterStepScope $event)
+    {
+        if (preg_match('/^I send a "[A-Z]+" request to ".+"/', $event->getStep()->getText())) {
+            $this->request->setHttpHeader('Accept', null);
+        }
+    }
+
     /**
      * Sets the default Accept HTTP header to null (workaround to artificially remove it).
      *
      * @BeforeScenario
      */
-    public function removeAcceptHeader()
+    public function removeAcceptHeaderBeforeScenario()
     {
         $this->request->setHttpHeader('Accept', null);
     }

features/bootstrap/HttpCacheContext.php

@@ -35,7 +35,7 @@ public function setKernel(KernelInterface $kernel)
      */
     public function irisShouldBePurged(string $iris)
     {
-        $purger = $this->kernel->getContainer()->get('api_platform.http_cache.purger');
+        $purger = $this->kernel->getContainer()->get('test.api_platform.http_cache.purger');
 
         $purgedIris = implode(',', $purger->getIris());
         $purger->clear();

features/doctrine/boolean_filter.feature

@@ -371,7 +371,7 @@ Feature: Boolean filter on collections
     And the JSON node "hydra:totalItems" should be equal to 15
 
   @dropSchema
-  Scenario: Get collection ordered by a non valid properties
+  Scenario: Get collection filtered by non valid properties
     When I send a "GET" request to "/dummies?unknown=0"
     Then the response status code should be 200
     And the response should be in JSON

features/http_cache/tags.feature

@@ -69,6 +69,7 @@ Feature: Cache invalidation through HTTP Cache tags
     {
     }
     """
+    When I add "Content-Type" header equal to "application/ld+json"
     And I send a "POST" request to "/relation2s" with body:
     """
     {

features/integration/nelmio_api_doc.feature

@@ -1,9 +1,11 @@
+@nobeta
+# Skip while NelmioApiDoc 2 isn't compatible with Symfony 3.4
 Feature: NelmioApiDoc integration
   In order to use NelmioApiDocBundle
   As an API software developer
   I need to see the generated documentation
 
-  Scenario: Create a user
+  Scenario: Test if the NelmioApiDoc integration works
     When I send a "GET" request to "/nelmioapidoc"
     Then the response status code should be 200
     And I should see text matching "AbstractDummy"

features/main/configurable.feature

@@ -1,6 +1,6 @@
 Feature: Configurable resource CRUD
   As a client software developer
-  I need to be able to configure api resources through Yaml
+  I need to be able to configure api resources through YAML
 
   @createSchema
   Scenario: Retrieve the ConfigDummy resource

tests/Fixtures/app/config/config.yml

@@ -143,6 +143,7 @@ services:
     app.config_dummy_resource.action:
         class: 'ApiPlatform\Core\Tests\Fixtures\TestBundle\Action\ConfigCustom'
         arguments: ['@api_platform.item_data_provider']
+        public: true
 
     app.entity.filter.dummy_car:
         parent:    'api_platform.doctrine.orm.search_filter'
@@ -198,6 +199,10 @@ services:
     api_platform.http_cache.purger:
         class: ApiPlatform\Core\Tests\Fixtures\NullPurger
 
+    test.api_platform.http_cache.purger:
+        alias: api_platform.http_cache.purger
+        public: true
+
     test.property_accessor:
         alias: property_accessor
         public: true