Test improvements (#66)

* Use `assertRedirectToRoute` where possible

* Use `from` in tests to better test redirects

Author: SebKay

tests/Feature/Controllers/AccountControllerTest.php

@@ -5,6 +5,7 @@
 use Inertia\Testing\AssertableInertia as Assert;
 
 use function Pest\Laravel\actingAs;
+use function Pest\Laravel\from;
 use function Pest\Laravel\get;
 use function Pest\Laravel\patch;
 
@@ -32,14 +33,15 @@
             'password' => 'oldPassword#123',
         ]);
 
-        actingAs($user)
+        from(route('account.edit'))
+            ->actingAs($user)
             ->patch(route('account.update'), $newData = [
                 'first_name' => 'Tim',
                 'last_name' => 'Drake',
                 'email' => 'tim@test.com',
                 'password' => 'newPassword#123',
             ])
-            ->assertRedirect()
+            ->assertRedirectToRoute('account.edit')
             ->assertSessionHas('success', __('account.updated'));
 
         expect($user->refresh())
@@ -72,11 +74,11 @@
 describe('Guests', function () {
     test("Can't access the edit page", function () {
         get(route('account.edit'))
-            ->assertRedirect(route('login'));
+            ->assertRedirectToRoute('login');
     });
 
     test("Can't update details", function () {
         patch(route('account.update'))
-            ->assertRedirect(route('login'));
+            ->assertRedirectToRoute('login');
     });
 });

tests/Feature/Controllers/EmailVerificationControllerTest.php

@@ -5,6 +5,7 @@
 use Inertia\Testing\AssertableInertia as Assert;
 
 use function Pest\Laravel\actingAs;
+use function Pest\Laravel\from;
 use function Pest\Laravel\get;
 use function Pest\Laravel\withoutExceptionHandling;
 
@@ -31,7 +32,7 @@
                 'id' => $user->getKey(),
                 'hash' => sha1($user->getEmailForVerification()),
             ]))
-            ->assertRedirect(route('home'));
+            ->assertRedirectToRoute('home');
 
         expect($user->refresh()->email_verified_at)->not()->toBeNull();
     });
@@ -41,9 +42,10 @@
 
         $user = User::factory()->unverified()->create();
 
-        actingAs($user)
+        from(route('verification.notice'))
+            ->actingAs($user)
             ->post(route('verification.send'))
-            ->assertRedirect();
+            ->assertRedirectToRoute('verification.notice');
 
         Notification::assertSentTo($user, Illuminate\Auth\Notifications\VerifyEmail::class);
     });
@@ -52,6 +54,6 @@
 describe('Guests', function () {
     test("Can't access the verification page", function () {
         get(route('verification.notice'))
-            ->assertRedirect(route('login'));
+            ->assertRedirectToRoute('login');
     });
 });

tests/Feature/Controllers/HomeControllerTest.php

@@ -20,6 +20,6 @@
 describe('Guests', function () {
     test("Can't access the home page", function () {
         get(route('home'))
-            ->assertRedirect(route('login'));
+            ->assertRedirectToRoute('login');
     });
 });

tests/Feature/Controllers/LoginControllerTest.php

@@ -6,14 +6,15 @@
 use function Pest\Laravel\actingAs;
 use function Pest\Laravel\assertAuthenticated;
 use function Pest\Laravel\assertGuest;
+use function Pest\Laravel\from;
 use function Pest\Laravel\get;
 use function Pest\Laravel\post;
 
 describe('Users', function () {
     test("Can't access the login page", function () {
         actingAs(User::factory()->create())
             ->get(route('login'))
-            ->assertRedirect(route('home'));
+            ->assertRedirectToRoute('home');
     });
 });
 
@@ -36,7 +37,7 @@
             'email' => $user->email,
             'password' => '12345',
         ])
-            ->assertRedirect(route('home'));
+            ->assertRedirectToRoute('home');
 
         assertAuthenticated();
     });
@@ -48,11 +49,12 @@
 
         $redirect = 'https://google.com';
 
-        post(route('login'), [
-            'email' => $user->email,
-            'password' => '12345',
-            'redirect' => $redirect,
-        ])
+        from(route('login'))
+            ->post(route('login'), [
+                'email' => $user->email,
+                'password' => '12345',
+                'redirect' => $redirect,
+            ])
             ->assertRedirect($redirect);
 
         assertAuthenticated();

tests/Feature/Controllers/LogoutControllerTest.php

@@ -10,7 +10,7 @@
     test('Can logout', function () {
         actingAs(User::factory()->create())
             ->post(route('logout'))
-            ->assertRedirect(route('login'));
+            ->assertRedirectToRoute('login');
 
         assertGuest();
     });
@@ -19,6 +19,6 @@
 describe('Guests', function () {
     test("Can't logout", function () {
         post(route('logout'))
-            ->assertRedirect(route('login'));
+            ->assertRedirectToRoute('login');
     });
 });

tests/Feature/Controllers/OrganisationControllerTest.php

@@ -3,6 +3,7 @@
 use App\Models\User;
 
 use function Pest\Laravel\actingAs;
+use function Pest\Laravel\from;
 use function Pest\Laravel\get;
 use function Pest\Laravel\patch;
 
@@ -28,11 +29,12 @@
     test("Can update their organisation's name", function () {
         expect($this->adminUser->organisation->name)->toBe('GCPD');
 
-        actingAs($this->adminUser)
+        from(route('organisation.edit'))
+            ->actingAs($this->adminUser)
             ->patch(route('organisation.update'), [
                 'name' => 'New Name',
             ])
-            ->assertRedirect();
+            ->assertRedirectToRoute('organisation.edit');
 
         expect($this->adminUser->organisation->refresh()->name)->toBe('New Name');
     });

tests/Feature/Controllers/RegisterControllerTest.php

@@ -14,7 +14,7 @@
     test("Can't access the register page", function () {
         actingAs(User::factory()->create())
             ->get(route('register'))
-            ->assertRedirect(route('home'));
+            ->assertRedirectToRoute('home');
     });
 });
 
@@ -39,7 +39,7 @@
             'email' => $email,
             'password' => 'P$ssword12345#',
         ])
-            ->assertRedirect(route('home'));
+            ->assertRedirectToRoute('home');
 
         assertDatabaseHas('users', [
             'email' => $email,

tests/Feature/Controllers/ResetPasswordControllerTest.php

@@ -28,7 +28,7 @@
     post(route('password.store'), [
         'email' => $user->email,
     ])
-        ->assertRedirect(route('login'));
+        ->assertRedirectToRoute('login');
 
     Notification::assertSentTo($user, ResetPassword::class);
 });
@@ -41,7 +41,7 @@
             'email' => fake()->email(),
         ])
         ->assertsessionHasErrors('email')
-        ->assertRedirect(route('password'));
+        ->assertRedirectToRoute('password');
 
     Notification::assertNothingSent();
 });
@@ -75,5 +75,5 @@
         'password' => $newPassword,
         'password_confirmation' => $newPassword,
     ]))
-        ->assertRedirect();
+        ->assertRedirectToRoute('login');
 });