Fix integration tests to properly account for the rule position in the API

Author: DaneEveritt

tests/Integration/Api/Client/AccountControllerTest.php

@@ -85,7 +85,7 @@ public function testEmailIsNotUpdatedWhenNotValid()
         ]);
 
         $response->assertStatus(Response::HTTP_UNPROCESSABLE_ENTITY);
-        $response->assertJsonPath('errors.0.code', 'required');
+        $response->assertJsonPath('errors.0.meta.rule', 'required');
         $response->assertJsonPath('errors.0.detail', 'The email field is required.');
 
         $response = $this->actingAs($user)->putJson('/api/client/account/email', [
@@ -94,7 +94,7 @@ public function testEmailIsNotUpdatedWhenNotValid()
         ]);
 
         $response->assertStatus(Response::HTTP_UNPROCESSABLE_ENTITY);
-        $response->assertJsonPath('errors.0.code', 'email');
+        $response->assertJsonPath('errors.0.meta.rule', 'email');
         $response->assertJsonPath('errors.0.detail', 'The email must be a valid email address.');
     }
 
@@ -156,7 +156,7 @@ public function testErrorIsReturnedIfPasswordIsNotConfirmed()
         ]);
 
         $response->assertStatus(Response::HTTP_UNPROCESSABLE_ENTITY);
-        $response->assertJsonPath('errors.0.code', 'confirmed');
+        $response->assertJsonPath('errors.0.meta.rule', 'confirmed');
         $response->assertJsonPath('errors.0.detail', 'The password confirmation does not match.');
     }
 }

tests/Integration/Api/Client/ApiKeyControllerTest.php

@@ -133,7 +133,7 @@ public function testValidationErrorIsReturnedForBadRequests()
         ]);
 
         $response->assertStatus(Response::HTTP_UNPROCESSABLE_ENTITY);
-        $response->assertJsonPath('errors.0.code', 'required');
+        $response->assertJsonPath('errors.0.meta.rule', 'required');
         $response->assertJsonPath('errors.0.detail', 'The description field is required.');
     }
 

tests/Integration/Api/Client/Server/CommandControllerTest.php

@@ -41,7 +41,7 @@ public function testValidationErrorIsReturnedIfNoCommandIsPresent()
         ]);
 
         $response->assertStatus(Response::HTTP_UNPROCESSABLE_ENTITY);
-        $response->assertJsonPath('errors.0.code', 'required');
+        $response->assertJsonPath('errors.0.meta.rule', 'required');
     }
 
     /**

tests/Integration/Api/Client/Server/NetworkAllocationControllerTest.php

@@ -63,7 +63,7 @@ public function testAllocationNotesCanBeUpdated(array $permissions)
 
         $this->actingAs($user)->postJson($this->link($allocation), [])
             ->assertStatus(Response::HTTP_UNPROCESSABLE_ENTITY)
-            ->assertJsonPath('errors.0.code', 'present');
+            ->assertJsonPath('errors.0.meta.rule', 'present');
 
         $this->actingAs($user)->postJson($this->link($allocation), ['notes' => 'Test notes'])
             ->assertOk()

tests/Integration/Api/Client/Server/PowerControllerTest.php

@@ -40,7 +40,7 @@ public function testInvalidPowerSignalResultsInError()
         ]);
 
         $response->assertStatus(Response::HTTP_UNPROCESSABLE_ENTITY);
-        $response->assertJsonPath('errors.0.code', 'in');
+        $response->assertJsonPath('errors.0.meta.rule', 'in');
         $response->assertJsonPath('errors.0.detail', 'The selected signal is invalid.');
     }
 

tests/Integration/Api/Client/Server/Schedule/CreateServerScheduleTest.php

@@ -71,7 +71,7 @@ public function testScheduleValidationRules()
                 'day_of_week' => '*',
             ])
             ->assertStatus(Response::HTTP_UNPROCESSABLE_ENTITY)
-            ->assertJsonPath('errors.0.code', 'boolean');
+            ->assertJsonPath('errors.0.meta.rule', 'boolean');
     }
 
     /**

tests/Integration/Api/Client/Server/ScheduleTask/CreateServerScheduleTaskTest.php

@@ -66,15 +66,15 @@ public function testValidationErrorsAreReturned()
             'time_offset' => 0,
         ])
             ->assertStatus(Response::HTTP_UNPROCESSABLE_ENTITY)
-            ->assertJsonPath('errors.0.code', 'in')
+            ->assertJsonPath('errors.0.meta.rule', 'in')
             ->assertJsonPath('errors.0.source.field', 'action');
 
         $this->actingAs($user)->postJson($this->link($schedule, '/tasks'), [
             'action' => 'command',
             'time_offset' => 0,
         ])
             ->assertStatus(Response::HTTP_UNPROCESSABLE_ENTITY)
-            ->assertJsonPath('errors.0.code', 'required_unless')
+            ->assertJsonPath('errors.0.meta.rule', 'required_unless')
             ->assertJsonPath('errors.0.source.field', 'payload');
 
         $this->actingAs($user)->postJson($this->link($schedule, '/tasks'), [
@@ -84,7 +84,7 @@ public function testValidationErrorsAreReturned()
             'sequence_id' => 'hodor',
         ])
             ->assertStatus(Response::HTTP_UNPROCESSABLE_ENTITY)
-            ->assertJsonPath('errors.0.code', 'numeric')
+            ->assertJsonPath('errors.0.meta.rule', 'numeric')
             ->assertJsonPath('errors.0.source.field', 'sequence_id');
     }
 

tests/Integration/Api/Client/Server/SettingsControllerTest.php

@@ -28,7 +28,7 @@ public function testServerNameCanBeChanged($permissions)
         ]);
 
         $response->assertStatus(Response::HTTP_UNPROCESSABLE_ENTITY);
-        $response->assertJsonPath('errors.0.code', 'required');
+        $response->assertJsonPath('errors.0.meta.rule', 'required');
 
         $server = $server->refresh();
         $this->assertSame($originalName, $server->name);

tests/Integration/Api/Client/TwoFactorControllerTest.php

@@ -64,7 +64,8 @@ public function testValidationErrorIsReturnedIfInvalidDataIsPassedToEnabled2FA()
         ]);
 
         $response->assertStatus(Response::HTTP_UNPROCESSABLE_ENTITY);
-        $response->assertJsonPath('errors.0.code', 'required');
+        $response->assertJsonPath('errors.0.code', 'ValidationException');
+        $response->assertJsonPath('errors.0.meta.rule', 'required');
     }
 
     /**