Update tests

paysera · Apr 19, 2024 · b47dd88 · b47dd88
1 parent 5de4d22
commit b47dd88
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 9 deletions.
diff --git a/tests/Functional/Fixtures/config/common.yml b/tests/Functional/Fixtures/config/common.yml
@@ -37,7 +37,7 @@ doctrine:
 
 services:
     logger:
-        class: Symfony\Component\ErrorHandler\BufferingLogger
+        class: Psr\Log\NullLogger
         public: true
     rest_registry:
         alias: paysera_api.rest_request_options_registry

diff --git a/tests/Functional/Fixtures/config/legacy_common.yml b/tests/Functional/Fixtures/config/legacy_common.yml
@@ -33,7 +33,7 @@ doctrine:
 
 services:
     logger:
-        class: Symfony\Component\Debug\BufferingLogger
+        class: Psr\Log\NullLogger
         public: true
     rest_registry:
         alias: paysera_api.rest_request_options_registry

diff --git a/tests/Functional/FunctionalAnnotationsTest.php b/tests/Functional/FunctionalAnnotationsTest.php
@@ -18,15 +18,33 @@ protected function setUp(): void
      * @dataProvider restRequestsConfigurationProvider
      * @param Response $expectedResponse
      * @param Request $request
+     * @param Response|null $extraResponseVersion
      */
-    public function testRestRequestConfiguration(Response $expectedResponse, Request $request)
-    {
+    public function testRestRequestConfiguration(
+        Response $expectedResponse,
+        Request $request,
+        Response $extraResponseVersion = null
+    ) {
         $response = $this->handleRequest($request);
-        $this->assertEquals(
-            $expectedResponse->getContent(),
-            $response->getContent(),
-            'expected correct content'
-        );
+        $assertionMessage = 'expected correct content';
+
+        if ($extraResponseVersion === null) {
+            $this->assertEquals(
+                $expectedResponse->getContent(),
+                $response->getContent(),
+                $assertionMessage
+            );
+        } else {
+            $this->assertThat(
+                $response->getContent(),
+                $this->logicalOr(
+                    $this->equalTo($expectedResponse->getContent()),
+                    $this->equalTo($extraResponseVersion->getContent())
+                ),
+                $assertionMessage
+            );
+        }
+
         $this->assertEquals(
             $expectedResponse->getStatusCode(),
             $response->getStatusCode(),
@@ -188,6 +206,20 @@ public function restRequestsConfigurationProvider()
                     '/annotated/testBodyNormalizationWithValidation',
                     ['field1' => 'not an email']
                 ),
+                new Response(
+                    json_encode([
+                        'error' => 'invalid_parameters',
+                        'error_description' => 'Some required parameter is missing or it\'s format is invalid',
+                        'errors' => [
+                            [
+                                'code' => 'invalid_format',
+                                'message' => 'This value is not a valid email address.',
+                                'field' => 'my_mapped_key',
+                            ],
+                        ],
+                    ]),
+                    400
+                ),
             ],
             'testBodyNormalizationWithInnerTypeValidation - should convert to snake case' => [
                 new Response(
@@ -209,6 +241,20 @@ public function restRequestsConfigurationProvider()
                     '/annotated/testBodyNormalizationWithInnerTypeValidation',
                     ['field1' => 'blah', 'internal' => ['field1' => 'not an email']]
                 ),
+                new Response(
+                    json_encode([
+                        'error' => 'invalid_parameters',
+                        'error_description' => 'Some required parameter is missing or it\'s format is invalid',
+                        'errors' => [
+                            [
+                                'code' => 'invalid_format',
+                                'message' => 'Custom message',
+                                'field' => 'internal_field1', // <-- this is converted from internalField1
+                            ],
+                        ],
+                    ]),
+                    400
+                ),
             ],
             'testBodyValidationCanBeTurnedOff' => [
                 new Response('OK', 200),
@@ -344,6 +390,20 @@ public function restRequestsConfigurationProvider()
                     'GET',
                     '/annotated/testQueryResolverValidationWithInvalidData?field1=not_an_email'
                 ),
+                new Response(
+                    json_encode([
+                        'error' => 'invalid_parameters',
+                        'error_description' => 'Some required parameter is missing or it\'s format is invalid',
+                        'errors' => [
+                            [
+                                'code' => 'invalid_format',
+                                'message' => 'This value is not a valid email address.',
+                                'field' => 'mapped_key',
+                            ],
+                        ],
+                    ]),
+                    400
+                ),
             ],
             'testRequiredPermissions without auth' => [
                 new Response(
@@ -451,6 +511,20 @@ public function restRequestsConfigurationProvider()
                     '/annotated/class/testValidation',
                     ['field1' => 'not an email', 'internal' => ['field1' => 'also not an email']]
                 ),
+                new Response(
+                    json_encode([
+                        'error' => 'invalid_parameters',
+                        'error_description' => 'Some required parameter is missing or it\'s format is invalid',
+                        'errors' => [
+                            [
+                                'code' => 'invalid_format',
+                                'message' => 'This value is not a valid email address.',
+                                'field' => 'my_mapped_key',
+                            ],
+                        ],
+                    ]),
+                    400
+                ),
             ],
             'testValidation with class annotation' => [
                 new Response(
@@ -472,6 +546,20 @@ public function restRequestsConfigurationProvider()
                     '/annotated/class/testValidationFromClass',
                     ['field1' => 'not an email', 'internal' => ['field1' => 'also not an email']]
                 ),
+                new Response(
+                    json_encode([
+                        'error' => 'invalid_parameters',
+                        'error_description' => 'Some required parameter is missing or it\'s format is invalid',
+                        'errors' => [
+                            [
+                                'code' => 'invalid_format',
+                                'message' => 'Custom message',
+                                'field' => 'internal.field1',
+                            ],
+                        ],
+                    ]),
+                    400
+                ),
             ],
             'testResponseNormalization' => [
                 new Response('{"field1_custom":"hi"}'),