[SF7] Fix PHPUnit tests

Sylius · Sep 4, 2024 · 66338cf · 66338cf
1 parent 6de5b05
commit 66338cf
Show file tree

Hide file tree

Showing 18 changed files with 95 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,7 +35,7 @@ jobs:
                       experimental: false
                     - php: 8.3
                       symfony: "^7.0"
-                      app_env: "test_without_fosrest"
+                      app_env: "test_without_hateoas"
                       experimental: true
                 exclude:
                     - php: "8.1"
@@ -176,6 +176,7 @@ jobs:
 
             -
                 name: Run lint container without friendsofsymfony/rest-bundle willdurand/hateoas-bundle jms/serializer-bundle packages
+                if: matrix.app_env == 'test'
                 run: |
                     composer remove --dev friendsofsymfony/rest-bundle willdurand/hateoas-bundle jms/serializer-bundle --no-scripts
                     (cd tests/Application && bin/console cache:clear --env=test_without_fosrest)
@@ -184,6 +185,7 @@ jobs:
 
             -
                 name: Run lint container without winzou/state-machine-bundle package
+                if: matrix.app_env == 'test'
                 run: |
                     composer remove winzou/state-machine-bundle --no-scripts
                     (cd tests/Application && bin/console cache:clear --env=test_without_state_machine)
@@ -192,6 +194,7 @@ jobs:
 
             -
                 name: Run lint container without twig/twig package
+                if: matrix.app_env == 'test'
                 run: |
                     composer remove symfony/twig-bundle --no-scripts
                     composer remove sylius/grid-bundle --no-scripts --dev

diff --git a/src/Component/legacy/tests/Symfony/EventListener/AddFormatListenerTest.php b/src/Component/legacy/tests/Symfony/EventListener/AddFormatListenerTest.php
@@ -20,6 +20,7 @@
 use Sylius\Resource\Metadata\HttpOperation;
 use Sylius\Resource\Metadata\Operation\HttpOperationInitiatorInterface;
 use Sylius\Resource\Symfony\EventListener\AddFormatListener;
+use Symfony\Component\HttpFoundation\HeaderBag;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
@@ -55,7 +56,7 @@ public function it_sets_format_from_accept_header(): void
         $this->operationInitiator->initializeOperation($request)->willReturn($operation);
 
         $request->attributes = new ParameterBag();
-        $request->headers = new ParameterBag(['Accept' => 'application/json']);
+        $request->headers = new HeaderBag(['Accept' => 'application/json']);
 
         $request->getFormat('application/json')->willReturn('json')->shouldBeCalled();
 
@@ -76,7 +77,7 @@ public function it_sets_format_from_request(): void
         $this->operationInitiator->initializeOperation($request)->willReturn($operation);
 
         $request->attributes = new ParameterBag(['_format' => 'json']);
-        $request->headers = new ParameterBag();
+        $request->headers = new HeaderBag();
 
         $request->getRequestFormat(null)->willReturn('json')->shouldBeCalled();
 
@@ -97,7 +98,7 @@ public function it_throws_an_exception_when_format_is_not_accepted(): void
         $this->operationInitiator->initializeOperation($request)->willReturn($operation);
 
         $request->attributes = new ParameterBag(['_format' => 'json-ld']);
-        $request->headers = new ParameterBag();
+        $request->headers = new HeaderBag();
 
         $request->getRequestFormat(null)->willReturn('json-ld')->shouldBeCalled();
 

diff --git a/tests/Application/config/bundles.php b/tests/Application/config/bundles.php
@@ -34,7 +34,7 @@
     TwigBundle::class => ['all' => true, 'test_without_twig' => false],
     FOSRestBundle::class => ['all' => true, 'test_without_fosrest' => false],
     JMSSerializerBundle::class => ['all' => true, 'test_without_fosrest' => false],
-    BazingaHateoasBundle::class => ['all' => true, 'test_without_fosrest' => false],
+    BazingaHateoasBundle::class => ['all' => true, 'test_without_hateoas' => false, 'test_without_fosrest' => false, 'test_with_attributes' => false],
     FidryAliceDataFixturesBundle::class => ['all' => true],
     NelmioAliceBundle::class => ['all' => true],
     winzouStateMachineBundle::class => ['all' => true, 'test_without_state_machine' => false],

diff --git a/tests/Application/config/packages/test_without_fosrest/framework.yaml b/tests/Application/config/packages/test_without_fosrest/framework.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: '../test/framework.yaml' }
diff --git a/tests/Application/config/packages/test_without_fosrest/grids.yaml b/tests/Application/config/packages/test_without_fosrest/grids.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: '../test/grids.yaml' }
diff --git a/tests/Application/config/packages/test_without_fosrest/sylius_grid.yaml b/tests/Application/config/packages/test_without_fosrest/sylius_grid.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: '../test/sylius_grid.yaml' }
diff --git a/tests/Application/config/packages/test_without_fosrest/winzou_state_machine.yaml b/tests/Application/config/packages/test_without_fosrest/winzou_state_machine.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: '../test/winzou_state_machine.yaml' }
diff --git a/tests/Application/config/packages/test_without_hateoas/fos_rest.yaml b/tests/Application/config/packages/test_without_hateoas/fos_rest.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: '../test/fos_rest.yaml' }
diff --git a/tests/Application/config/packages/test_without_hateoas/framework.yaml b/tests/Application/config/packages/test_without_hateoas/framework.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: '../test/framework.yaml' }
diff --git a/tests/Application/config/packages/test_without_hateoas/grids.yaml b/tests/Application/config/packages/test_without_hateoas/grids.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: '../test/grids.yaml' }
diff --git a/tests/Application/config/packages/test_without_hateoas/jms_serializer.yaml b/tests/Application/config/packages/test_without_hateoas/jms_serializer.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: '../test/jms_serializer.yaml' }
diff --git a/tests/Application/config/packages/test_without_hateoas/sylius_grid.yaml b/tests/Application/config/packages/test_without_hateoas/sylius_grid.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: '../test/sylius_grid.yaml' }
diff --git a/tests/Application/config/packages/test_without_hateoas/twig.yaml b/tests/Application/config/packages/test_without_hateoas/twig.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: '../test/twig.yaml' }
diff --git a/tests/Application/config/packages/test_without_hateoas/winzou_state_machine.yaml b/tests/Application/config/packages/test_without_hateoas/winzou_state_machine.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: '../test/winzou_state_machine.yaml' }
diff --git a/tests/Application/config/services.yaml b/tests/Application/config/services.yaml
@@ -70,14 +70,22 @@ services:
             - '%app.model.book_translation.class%'
         tags: ['form.type']
 
-    Gedmo\Sortable\SortableListener:
-        calls:
-            -
-                setAnnotationReader: ['@?annotation_reader']
+    gedmo_doctrine_extensions.mapping.driver.attribute:
+        class: Gedmo\Mapping\Driver\AttributeReader
+        public: false
+
+    gedmo.listener.sortable:
+        class: Gedmo\Sortable\SortableListener
         tags:
-            -
-                name: doctrine.event_subscriber
-                connection: default
+            - { name: doctrine.event_listener, event: 'onFlush' }
+            - { name: doctrine.event_listener, event: 'loadClassMetadata' }
+            - { name: doctrine.event_listener, event: 'prePersist' }
+            - { name: doctrine.event_listener, event: 'postPersist' }
+            - { name: doctrine.event_listener, event: 'preUpdate' }
+            - { name: doctrine.event_listener, event: 'postRemove' }
+            - { name: doctrine.event_listener, event: 'postFlush' }
+        calls:
+            - [ setAnnotationReader, [ "@gedmo_doctrine_extensions.mapping.driver.attribute" ] ]
 
     App\Repository\ComicBookRepository: null
     App\Repository\LegacyBookRepository: null

diff --git a/tests/Application/src/Subscription/Entity/Subscription.php b/tests/Application/src/Subscription/Entity/Subscription.php
@@ -41,11 +41,12 @@
 #[Update]
 #[Delete]
 #[BulkDelete]
-#[ApplyStateMachineTransition(stateMachineTransition: 'accept')]
-#[ApplyStateMachineTransition(stateMachineTransition: 'reject')]
+#[ApplyStateMachineTransition(stateMachineTransition: 'accept', stateMachineGraph: 'subscription')]
+#[ApplyStateMachineTransition(stateMachineTransition: 'reject', stateMachineGraph: 'subscription')]
 #[BulkUpdate(
     shortName: 'bulk_accept',
     stateMachineTransition: 'accept',
+    stateMachineGraph: 'subscription',
 )]
 #[Show(
     template: 'subscription/show.html.twig',

diff --git a/tests/Application/src/Tests/Controller/BookApiTest.php b/tests/Application/src/Tests/Controller/BookApiTest.php
@@ -23,6 +23,8 @@ class BookApiTest extends JsonApiTestCase
      */
     public function it_allows_creating_a_book()
     {
+        $this->markAsSkippedIfNecessary();
+
         $data =
 <<<EOT
         {
@@ -103,6 +105,8 @@ public function it_allows_removing_a_book()
      */
     public function it_allows_showing_a_book()
     {
+        $this->markAsSkippedIfNecessary();
+
         $objects = $this->loadFixturesFromFile('books.yml');
 
         $this->client->request('GET', '/books/' . $objects['book1']->getId());
@@ -115,6 +119,8 @@ public function it_allows_showing_a_book()
      */
     public function it_allows_indexing_books()
     {
+        $this->markAsSkippedIfNecessary();
+
         $this->loadFixturesFromFile('books.yml');
 
         $this->client->request('GET', '/books/');
@@ -127,6 +133,8 @@ public function it_allows_indexing_books()
      */
     public function it_allows_paginating_the_index_of_books()
     {
+        $this->markAsSkippedIfNecessary();
+
         $this->loadFixturesFromFile('more_books.yml');
 
         $this->client->request('GET', '/books/', ['page' => 2]);
@@ -139,6 +147,8 @@ public function it_allows_paginating_the_index_of_books()
      */
     public function it_does_not_allow_showing_resource_if_it_not_exists()
     {
+        $this->markAsSkippedIfNecessary();
+
         $this->loadFixturesFromFile('books.yml');
 
         $this->client->request('GET', '/books/3');
@@ -151,6 +161,8 @@ public function it_does_not_allow_showing_resource_if_it_not_exists()
      */
     public function it_does_not_apply_sorting_for_un_existing_field()
     {
+        $this->markAsSkippedIfNecessary();
+
         $this->loadFixturesFromFile('more_books.yml');
 
         $this->client->request('GET', '/sortable-books/', ['sorting' => ['name' => 'DESC']]);
@@ -164,6 +176,8 @@ public function it_does_not_apply_sorting_for_un_existing_field()
      */
     public function it_does_not_apply_filtering_for_un_existing_field()
     {
+        $this->markAsSkippedIfNecessary();
+
         $this->loadFixturesFromFile('more_books.yml');
 
         $this->client->request('GET', '/filterable-books/', ['criteria' => ['name' => 'John']]);
@@ -177,6 +191,8 @@ public function it_does_not_apply_filtering_for_un_existing_field()
      */
     public function it_applies_sorting_for_existing_field()
     {
+        $this->markAsSkippedIfNecessary();
+
         $this->loadFixturesFromFile('more_books.yml');
 
         $this->client->request('GET', '/sortable-books/', ['sorting' => ['id' => 'DESC']]);
@@ -190,6 +206,8 @@ public function it_applies_sorting_for_existing_field()
      */
     public function it_applies_filtering_for_existing_field()
     {
+        $this->markAsSkippedIfNecessary();
+
         $this->loadFixturesFromFile('more_books.yml');
 
         $this->client->request('GET', '/filterable-books/', ['criteria' => ['author' => 'J.R.R. Tolkien']]);
@@ -203,6 +221,8 @@ public function it_applies_filtering_for_existing_field()
      */
     public function it_allows_creating_a_book_via_custom_factory()
     {
+        $this->markAsSkippedIfNecessary();
+
         $data =
             <<<EOT
                     {
@@ -225,6 +245,8 @@ public function it_allows_creating_a_book_via_custom_factory()
      */
     public function it_allows_indexing_books_via_custom_repository(): void
     {
+        $this->markAsSkippedIfNecessary();
+
         $this->loadFixturesFromFile('books.yml');
 
         $this->client->request('GET', '/find-custom-books');
@@ -237,10 +259,19 @@ public function it_allows_indexing_books_via_custom_repository(): void
      */
     public function it_allows_showing_a_book_via_custom_repository()
     {
+        $this->markAsSkippedIfNecessary();
+
         $this->loadFixturesFromFile('books.yml');
 
         $this->client->request('GET', '/find-custom-book');
         $response = $this->client->getResponse();
         $this->assertResponse($response, 'books/show_response');
     }
+
+    private function markAsSkippedIfNecessary(): void
+    {
+        if ('test_without_hateoas' === self::$sharedKernel->getEnvironment()) {
+            $this->markTestSkipped();
+        }
+    }
 }
diff --git a/tests/Application/src/Tests/Controller/ComicBookApiTest.php b/tests/Application/src/Tests/Controller/ComicBookApiTest.php
@@ -44,6 +44,8 @@ public function it_allows_creating_a_comic_book()
      */
     public function it_allows_versioned_creating_a_comic_book()
     {
+        $this->markAsSkippedIfNecessary();
+
         $data =
 <<<EOT
         {
@@ -134,6 +136,8 @@ public function it_allows_showing_a_comic_book()
      */
     public function it_allows_versioning_of_a_showing_comic_book_serialization()
     {
+        $this->markAsSkippedIfNecessary();
+
         $objects = $this->loadFixturesFromFile('comic_books.yml');
 
         $this->client->request('GET', '/v1.2/comic-books/' . $objects['comic-book1']->getId());
@@ -146,6 +150,8 @@ public function it_allows_versioning_of_a_showing_comic_book_serialization()
      */
     public function it_allows_indexing_of_comic_books()
     {
+        $this->markAsSkippedIfNecessary();
+
         $this->loadFixturesFromFile('comic_books.yml');
 
         $this->client->request('GET', '/v1/comic-books/');
@@ -158,6 +164,8 @@ public function it_allows_indexing_of_comic_books()
      */
     public function it_allows_versioned_indexing_of_comic_books()
     {
+        $this->markAsSkippedIfNecessary();
+
         $this->loadFixturesFromFile('comic_books.yml');
 
         $this->client->request('GET', '/v1.2/comic-books/');
@@ -176,4 +184,11 @@ public function it_does_not_allow_showing_resource_if_it_does_not_exist()
         $response = $this->client->getResponse();
         $this->assertResponseCode($response, Response::HTTP_NOT_FOUND);
     }
+
+    private function markAsSkippedIfNecessary(): void
+    {
+        if ('test_without_hateoas' === self::$sharedKernel->getEnvironment()) {
+            $this->markTestSkipped();
+        }
+    }
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		imports:
		- { resource: '../test/framework.yaml' }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		imports:
		- { resource: '../test/sylius_grid.yaml' }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		imports:
		- { resource: '../test/winzou_state_machine.yaml' }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		imports:
		- { resource: '../test/fos_rest.yaml' }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		imports:
		- { resource: '../test/jms_serializer.yaml' }