Revert changes to tests

spatie · Dec 3, 2022 · c5f7f07 · c5f7f07
1 parent c89dde3
commit c5f7f07
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 33 deletions.
diff --git a/tests/Resolvers/DataClassValidationRulesResolverTest.php b/tests/Resolvers/DataClassValidationRulesResolverTest.php
@@ -78,7 +78,7 @@ public static function rules(): array
     };
 
     expect(
-        $this->resolver->execute($data::class, ['collection' => [[]]])->all()
+        $this->resolver->execute($data::class)->all()
     )->toEqualCanonicalizing([
         'nested' => ['array', 'required'],
         'nested.string' => ['string', 'required', 'min:10', 'max:100'],

diff --git a/tests/Resolvers/DataPropertyValidationRulesResolverTest.php b/tests/Resolvers/DataPropertyValidationRulesResolverTest.php
@@ -154,9 +154,7 @@ function resolveRules(object $class, array $payload = []): array
     $rules = resolveRules(new class () {
         #[DataCollectionOf(SimpleData::class)]
         public DataCollection $property;
-    }, [
-        'property' => [[]],
-    ]);
+    });
 
     expect($rules)->toMatchArray([
         'property' => ['present', 'array'],
@@ -166,9 +164,7 @@ function resolveRules(object $class, array $payload = []): array
     $rules = resolveRules(new class () {
         #[DataCollectionOf(SimpleData::class)]
         public ?DataCollection $property;
-    }, [
-        'property' => [[]],
-    ]);
+    });
 
     expect($rules)->toMatchArray([
         'property' => ['nullable', 'array'],
@@ -178,9 +174,7 @@ function resolveRules(object $class, array $payload = []): array
     $rules = resolveRules(new class () {
         #[DataCollectionOf(SimpleData::class)]
         public Optional|DataCollection $property;
-    }, [
-        'property' => [[]],
-    ]);
+    });
 
     expect($rules)->toMatchArray([
         'property' => ['sometimes', 'array'],
@@ -190,9 +184,7 @@ function resolveRules(object $class, array $payload = []): array
     $rules = resolveRules(new class () {
         #[DataCollectionOf(SimpleData::class)]
         public null|Optional|DataCollection $property;
-    }, [
-        'property' => [[]],
-    ]);
+    });
 
     expect($rules)->toMatchArray([
         'property' => ['nullable', 'sometimes', 'array'],
@@ -291,9 +283,7 @@ function resolveRules(object $class, array $payload = []): array
     $rules = resolveRules(new class () {
         #[DataCollectionOf(SimpleData::class), MapName('other')]
         public DataCollection $property;
-    }, [
-        'other' => [[]],
-    ]);
+    });
 
     expect($rules)->toMatchArray([
         'other' => ['present', 'array'],
@@ -303,11 +293,7 @@ function resolveRules(object $class, array $payload = []): array
     $rules = resolveRules(new class () {
         #[MapName('other')]
         public DataWithMapper $property;
-    }, [
-        'other' => [
-            'data_collection_cased_property' => [[]],
-        ],
-    ]);
+    });
 
     expect($rules)->toMatchArray([
         'other' => ['required', 'array'],
@@ -360,7 +346,7 @@ function () {
             public DataCollection $property;
         };
 
-        expect(resolveRules($data, ['property' => [[]]]))->toMatchArray([
+        expect(resolveRules($data))->toMatchArray([
             'property' => ['present', 'array', 'size:10'],
             'property.*.string' => ['string', 'required'],
         ]);

diff --git a/tests/ValidationTest.php b/tests/ValidationTest.php
@@ -489,8 +489,6 @@ class NestedClassG extends Data {
         ->assertRules([
             'collection' => ['present', 'array'],
             'collection.*.string' => ['string', 'required'],
-        ], [
-            'collection' => [[]],
         ]);
 });
 
@@ -518,8 +516,6 @@ class NestedClassG extends Data {
         ->assertRules([
             'collection' => ['nullable', 'array'],
             'collection.*.string' => ['string', 'required'],
-        ], [
-            'collection' => [[]],
         ]);
 });
 
@@ -547,8 +543,6 @@ class NestedClassG extends Data {
         ->assertRules([
             'collection' => ['sometimes', 'array'],
             'collection.*.string' => ['string', 'required'],
-        ], [
-            'collection' => [[]],
         ]);
 });
 
@@ -584,8 +578,6 @@ public static function rules(): array
         ->assertRules([
             'collection' => ['present', 'array', 'min:10'],
             'collection.*.email' => ['string', 'required', 'email:rfc'],
-        ], [
-            'collection' => [[]],
         ]);
 });
 
@@ -610,14 +602,13 @@ class CollectionClassA extends Data {
         public DataCollection $collection;
     };
 
-    $payload = ['collection' => [['nested' => ['string' => 'Hello World']]]];
     DataValidationAsserter::for($dataClass)
         ->assertRules([
             'collection' => ['present', 'array'],
             'collection.*.nested' => ['required', 'array'],
             'collection.*.nested.string' => ['required', 'string'],
-        ], $payload)
-        ->assertOk($payload);
+        ])
+        ->assertOk(['collection' => [['nested' => ['string' => 'Hello World']]]]);
 });
 
 it('can nest data with payload using relative rule generation', function () {