Allow passing an url generation strategy instead of a bool

Author: antograssiot

.circleci/config.yml

@@ -353,7 +353,7 @@ jobs:
           name: Run Behat tests
           command: |
             mkdir -p build/logs/behat build/coverage
-            for f in $(find features -name '*.feature' -not -path 'features/main/exposed_state.feature' -not -path 'features/elasticsearch/*' -not -path 'features/mongodb/*' -not -path 'features/absolute_url/*' | circleci tests split --split-by=timings); do
+            for f in $(find features -name '*.feature' -not -path 'features/main/exposed_state.feature' -not -path 'features/elasticsearch/*' -not -path 'features/mongodb/*' -not -path 'features/absolute_url/*' -not -path 'features/network_path/*' | circleci tests split --split-by=timings); do
               _f=$(echo "$f" | tr / _)
               FEATURE="${_f}" vendor/bin/behat --format=progress --out=std --format=junit --out=build/logs/behat/"${_f}" --profile=default-coverage --no-interaction --colors "$f"
             done
@@ -508,48 +508,6 @@ jobs:
           file: build/logs/clover.xml
       - save-npm-cache
 
-  behat-absolute-url-coverage:
-    executor: php
-    environment:
-      APP_ENV: absolute_url
-    working_directory: ~/api-platform/core
-    steps:
-      - checkout
-      - install-mongodb-php-extension
-      - install-pcov-php-extension
-      - disable-xdebug-php-extension
-      - disable-php-memory-limit
-      - restore-composer-cache
-      - update-project-dependencies
-      - save-composer-cache
-      - clear-test-app-cache
-      - run:
-          name: Run Behat tests
-          command: |
-            mkdir -p build/logs/behat
-            vendor/bin/behat --format=progress --out=std --format=junit --out=build/logs/behat --profile=absoluteUrl --no-interaction --colors
-      - restore-npm-cache
-      - merge-test-reports:
-          dir: build/logs/behat
-          out: build/logs/behat/junit.xml
-      - store_test_results:
-          path: build/logs
-      - store_artifacts:
-          path: build/logs/behat/junit.xml
-          destination: build/logs/behat/junit.xml
-      - merge-code-coverage-reports:
-          dir: build/coverage
-          out: build/logs/clover.xml
-      - store_artifacts:
-          path: build/logs/clover.xml
-          destination: build/logs/clover.xml
-      - codecov/upload:
-          file: build/logs/clover.xml
-          flags: behat_absolute_url
-      - coveralls/upload:
-          file: build/logs/clover.xml
-      - save-npm-cache
-
 workflows:
   version: 2
   lint:
@@ -563,4 +521,3 @@ workflows:
       - phpunit-mongodb-coverage
       - behat-mongodb-coverage
       - behat-elasticsearch-coverage
-      - behat-absolute-url-coverage

.travis.yml

@@ -258,7 +258,28 @@ jobs:
       script:
         - *run-phpunit-tests
         - *clear-test-app-cache
-        - vendor/bin/behat --format=progress --profile=absoluteUrl --no-interaction
+        - vendor/bin/behat --format=progress --profile=absolute-url --no-interaction
+        - *validate-openapi-v2-json
+        - *validate-openapi-v2-yaml
+        - *validate-openapi-v3-json
+        - *validate-openapi-v3-yaml
+
+
+    - php: '7.3'
+      env: APP_ENV=network_path
+      before_install:
+        - *enable-mongodb-php-extension
+        - *disable-xdebug-php-extension
+        - *disable-php-memory-limit
+        - *add-composer-bin-dir-to-path
+      install:
+        - *update-project-dependencies
+      before_script:
+        - *clear-test-app-cache
+      script:
+        - *run-phpunit-tests
+        - *clear-test-app-cache
+        - vendor/bin/behat --format=progress --profile=network-path --no-interaction
         - *validate-openapi-v2-json
         - *validate-openapi-v2-yaml
         - *validate-openapi-v3-json

behat.yml.dist

@@ -20,7 +20,7 @@ default:
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'Behatch\Context\RestContext'
       filters:
-        tags: '~@postgres&&~@mongodb&&~@elasticsearch&&~@absoluteUrl'
+        tags: '~@postgres&&~@mongodb&&~@elasticsearch&&~@absoluteUrl&&~@networkPath'
   extensions:
     'Behat\Symfony2Extension':
       kernel:
@@ -40,7 +40,7 @@ default-no-legacy:
   suites:
     default:
       filters:
-        tags: '~@postgres&&~@mongodb&&~@elasticsearch&&~@legacy'
+        tags: '~@postgres&&~@mongodb&&~@elasticsearch&&~@legacy&&~@absoluteUrl&&~@networkPath'
 
 postgres:
   suites:
@@ -65,7 +65,7 @@ postgres:
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'Behatch\Context\RestContext'
       filters:
-        tags: '~@sqlite&&~@mongodb&&~@elasticsearch&&~@absoluteUrl'
+        tags: '~@sqlite&&~@mongodb&&~@elasticsearch&&~@absoluteUrl&&~@networkPath'
 
 postgres-no-legacy:
   suites:
@@ -98,7 +98,7 @@ mongodb:
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'Behatch\Context\RestContext'
       filters:
-        tags: '~@sqlite&&~@elasticsearch&&~@!mongodb&&~@absoluteUrl'
+        tags: '~@sqlite&&~@elasticsearch&&~@!mongodb&&~@absoluteUrl&&~@networkPath'
 
 mongodb-no-legacy:
   suites:
@@ -135,6 +135,22 @@ elasticsearch-no-legacy:
       filters:
         tags: '@elasticsearch&&~@legacy'
 
+network-path:
+  suites:
+    default: false
+    network-path:
+      paths:
+        - '%paths.base%/features/network_path'
+      contexts:
+        - 'DoctrineContext':
+            doctrine: '@doctrine'
+            passwordEncoder: '@security.password_encoder'
+        - 'JsonContext'
+        - 'Behatch\Context\RestContext'
+        - 'Behat\MinkExtension\Context\MinkContext'
+      filters:
+        tags: '@networkPath'
+
 default-coverage:
   suites:
     default:

features/absolute_url/hal/absolute_url.feature

@@ -7,7 +7,6 @@ Feature: IRI should contain Absolute URL
   Scenario: I should be able to GET a collection of Objects with Absolute Urls
     Given there are 1 absoluteUrlDummy objects with a related absoluteUrlRelationDummy
     And I add "Accept" header equal to "application/hal+json"
-    And I add "Content-Type" header equal to "application/json"
     And I send a "GET" request to "/absolute_url_dummies"
     And the JSON should be equal to:
     """

features/absolute_url/hal/entrypoint.feature

@@ -2,8 +2,6 @@
 Feature: Check the Entrypoint with Absolute URLs
 
   Scenario: Retrieve the API Entrypoint
-    And I add "Accept" header equal to "application/hal+json"
-    And I add "Content-Type" header equal to "application/json"
+    Given I add "Accept" header equal to "application/hal+json"
     And I send a "GET" request to "/"
-    And the JSON nodes should be equal to:
-    | _links.self.href | http://example.com/ |
+    Then the JSON node "_links.self.href" should be equal to "http://example.com/"

features/absolute_url/jsonapi/absolute_url.feature

@@ -7,7 +7,6 @@ Feature: IRI should contain Absolute URL
   Scenario: I should be able to GET a collection of Objects with Absolute Urls
     Given there are 1 absoluteUrlDummy objects with a related absoluteUrlRelationDummy
     And I add "Accept" header equal to "application/vnd.api+json"
-    And I add "Content-Type" header equal to "application/json"
     And I send a "GET" request to "/absolute_url_dummies"
     And the JSON should be equal to:
     """
@@ -65,7 +64,6 @@ Feature: IRI should contain Absolute URL
 
   Scenario: I should be able to GET an Item with Absolute Urls
     Given I add "Accept" header equal to "application/vnd.api+json"
-    And I add "Content-Type" header equal to "application/json"
     And I send a "GET" request to "/absolute_url_dummies/1"
     And the JSON should be equal to:
     """
@@ -90,7 +88,6 @@ Feature: IRI should contain Absolute URL
 
   Scenario: I should be able to GET subresources with Absolute Urls
     Given I add "Accept" header equal to "application/vnd.api+json"
-    And I add "Content-Type" header equal to "application/json"
     And I send a "GET" request to "/absolute_url_relation_dummies/1/absolute_url_dummies"
     And the JSON should be equal to:
     """

features/absolute_url/jsonapi/entrypoint.feature

@@ -2,8 +2,6 @@
 Feature: Check the Entrypoint with Absolute URLs
 
   Scenario: Retrieve the API Entrypoint
-    And I add "Accept" header equal to "application/hal+json"
-    And I add "Content-Type" header equal to "application/json"
+    Given I add "Accept" header equal to "application/vnd.api+json"
     And I send a "GET" request to "/"
-    And the JSON nodes should be equal to:
-    | _links.self.href | http://example.com/ |
+    Then the JSON node "links.self" should be equal to "http://example.com/"

features/absolute_url/jsonld/absolute_url.feature

@@ -7,7 +7,6 @@ Feature: IRI should contain Absolute URL
   Scenario: I should be able to GET a collection of Objects with Absolute Urls
     Given there are 1 absoluteUrlDummy objects with a related absoluteUrlRelationDummy
     And I add "Accept" header equal to "application/ld+json"
-    And I add "Content-Type" header equal to "application/json"
     And I send a "GET" request to "/absolute_url_dummies"
     And the JSON should be equal to:
     """
@@ -51,9 +50,7 @@ Feature: IRI should contain Absolute URL
 
   Scenario: I should be able to GET an Item with Absolute Urls
     Given I add "Accept" header equal to "application/ld+json"
-    And I add "Content-Type" header equal to "application/json"
     And I send a "GET" request to "/absolute_url_dummies/1"
-    And print last JSON response
     And the JSON should be equal to:
     """
     {
@@ -67,9 +64,7 @@ Feature: IRI should contain Absolute URL
 
   Scenario: I should be able to GET subresources with Absolute Urls
     Given I add "Accept" header equal to "application/ld+json"
-    And I add "Content-Type" header equal to "application/json"
     And I send a "GET" request to "/absolute_url_relation_dummies/1/absolute_url_dummies"
-    And print last JSON response
     And the JSON should be equal to:
     """
     {

features/absolute_url/jsonld/entrypoint.feature

@@ -2,10 +2,24 @@
 Feature: Check the Entrypoint with Absolute URLs
 
   Scenario: Retrieve the API Entrypoint
-    And I add "Accept" header equal to "application/ld+json"
-    And I add "Content-Type" header equal to "application/json"
+    Given I add "Accept" header equal to "application/ld+json"
     And I send a "GET" request to "/"
-    And the JSON nodes should be equal to:
+    Then the JSON nodes should be equal to:
     | @context  | http://example.com/contexts/Entrypoint  |
     | @id       | http://example.com/                     |
     | @type     | Entrypoint                              |
+
+
+  Scenario: Get an error during deserialization of simple relation
+    Given I add "Accept" header equal to "application/ld+json"
+    And I add "Content-Type" header equal to "application/ld+json"
+    And I send a "POST" request to "/dummies" with body:
+    """
+    {
+      "name": "Foo",
+      "relatedDummy": {
+        "name": "bar"
+      }
+    }
+    """
+    Then the JSON node "@context" should be equal to "http://example.com/contexts/Error"

features/absolute_url/jsonld/errors.feature

@@ -0,0 +1,16 @@
+@absoluteUrl
+Feature: Check the Errors with Absolute URLs
+
+  Scenario: Get an error during deserialization of simple relation
+    Given I add "Accept" header equal to "application/ld+json"
+    And I add "Content-Type" header equal to "application/ld+json"
+    And I send a "POST" request to "/dummies" with body:
+    """
+    {
+      "name": "Foo",
+      "relatedDummy": {
+        "name": "bar"
+      }
+    }
+    """
+    And the JSON node "@context" should be equal to "http://example.com/contexts/Error"

features/doctrine/search_filter.feature

@@ -804,7 +804,6 @@ Feature: Search filter on collections
     When I send a "GET" request to "/converted_owners?name_converted.name_converted=Converted 3"
     Then the response status code should be 200
     And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
-    Then print last JSON response
     And the JSON should be valid according to this schema:
     """
     {

features/network_path/hal/entrypoint.feature

@@ -0,0 +1,8 @@
+@networkPath
+Feature: Check the Entrypoint with network path
+
+  Scenario: Retrieve the API Entrypoint
+    Given I add "Accept" header equal to "application/hal+json"
+    And I send a "GET" request to "/"
+    Then the JSON node "_links.self.href" should be equal to "//example.com/"
+