Merge pull request #69 from TheDragonCode/9.x

Fixed tests for Laravel 7

Author: Andrey Helldar

composer.json

@@ -32,6 +32,7 @@
         "symfony/http-foundation": "^4.0 || ^5.0 || ^6.0"
     },
     "require-dev": {
+        "dragon-code/laravel-support": "^3.3",
         "orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0"
     },
     "conflict": {

tests/Fixtures/Concerns/Validationable.php

@@ -17,6 +17,7 @@
 
 namespace Tests\Fixtures\Concerns;
 
+use DragonCode\LaravelSupport\Facades\AppVersion;
 use Illuminate\Contracts\Validation\Validator as ValidatorContract;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
@@ -70,4 +71,9 @@ protected function validateException(array $data)
             ? new ValidationException($validator)
             : $validator->validated();
     }
+
+    protected function validationUrlMessage(): array
+    {
+        return AppVersion::is7x() ? ['The baz format is invalid.'] : ['The baz must be a valid URL.'];
+    }
 }

tests/Laravel/Parsers/Validation/NoWithDataTest.php

@@ -57,16 +57,15 @@ public function testStructure()
             $this->validationResponse([])->getJson()
         );
 
-        $this->assertSame(
-            [
-                'error' => [
-                    'type' => 'ValidationException',
-                    'data' => [
-                        'foo' => ['The foo field is required.'],
-                        'baz' => ['The baz must be a valid URL.'],
-                    ],
+        $this->assertSame([
+            'error' => [
+                'type' => 'ValidationException',
+                'data' => [
+                    'foo' => ['The foo field is required.'],
+                    'baz' => $this->validationUrlMessage(),
                 ],
             ],
+        ],
             $this->validationResponse(['baz' => 0])->getJson()
         );
 
@@ -77,7 +76,7 @@ public function testStructure()
                     'data' => [
                         'foo' => ['The foo field is required.'],
                         'bar' => ['The bar must be an integer.'],
-                        'baz' => ['The baz must be a valid URL.'],
+                        'baz' => $this->validationUrlMessage(),
                     ],
                 ],
             ],

tests/Laravel/Parsers/Validation/NoWithNoDataTest.php

@@ -65,7 +65,7 @@ public function testStructure()
                     'type' => 'ValidationException',
                     'data' => [
                         'foo' => ['The foo field is required.'],
-                        'baz' => ['The baz must be a valid URL.'],
+                        'baz' => $this->validationUrlMessage(),
                     ],
                 ],
             ],
@@ -79,7 +79,7 @@ public function testStructure()
                     'data' => [
                         'foo' => ['The foo field is required.'],
                         'bar' => ['The bar must be an integer.'],
-                        'baz' => ['The baz must be a valid URL.'],
+                        'baz' => $this->validationUrlMessage(),
                     ],
                 ],
             ],

tests/Laravel/Parsers/Validation/WithDataTest.php

@@ -62,7 +62,7 @@ public function testStructure()
                     'type' => 'ValidationException',
                     'data' => [
                         'foo' => ['The foo field is required.'],
-                        'baz' => ['The baz must be a valid URL.'],
+                        'baz' => $this->validationUrlMessage(),
                     ],
                 ],
             ],
@@ -76,7 +76,7 @@ public function testStructure()
                     'data' => [
                         'foo' => ['The foo field is required.'],
                         'bar' => ['The bar must be an integer.'],
-                        'baz' => ['The baz must be a valid URL.'],
+                        'baz' => $this->validationUrlMessage(),
                     ],
                 ],
             ],

tests/Laravel/Parsers/Validation/WithNoDataTest.php

@@ -64,7 +64,7 @@ public function testStructure()
                     'type' => 'ValidationException',
                     'data' => [
                         'foo' => ['The foo field is required.'],
-                        'baz' => ['The baz must be a valid URL.'],
+                        'baz' => $this->validationUrlMessage(),
                     ],
                 ],
             ],
@@ -78,7 +78,7 @@ public function testStructure()
                     'data' => [
                         'foo' => ['The foo field is required.'],
                         'bar' => ['The bar must be an integer.'],
-                        'baz' => ['The baz must be a valid URL.'],
+                        'baz' => $this->validationUrlMessage(),
                     ],
                 ],
             ],