fix Testa and refactor routes names to be consistent

pushpak1300 · pushpak1300 · commit 2a9976b65f29 · 2025-10-14T22:24:45.000+05:30
diff --git a/resources/views/components/layouts/app/header.blade.php b/resources/views/components/layouts/app/header.blade.php
@@ -73,7 +73,7 @@ class="flex h-full w-full items-center justify-center rounded-lg bg-neutral-200
                     <flux:menu.separator />
 
                     <flux:menu.radio.group>
-                        <flux:menu.item :href="route('settings.profile')" icon="cog" wire:navigate>{{ __('Settings') }}</flux:menu.item>
+                        <flux:menu.item :href="route('profile.edit')" icon="cog" wire:navigate>{{ __('Settings') }}</flux:menu.item>
                     </flux:menu.radio.group>
 
                     <flux:menu.separator />
diff --git a/resources/views/components/layouts/app/sidebar.blade.php b/resources/views/components/layouts/app/sidebar.blade.php
@@ -60,7 +60,7 @@ class="flex h-full w-full items-center justify-center rounded-lg bg-neutral-200
                     <flux:menu.separator />
 
                     <flux:menu.radio.group>
-                        <flux:menu.item :href="route('settings.profile')" icon="cog" wire:navigate>{{ __('Settings') }}</flux:menu.item>
+                        <flux:menu.item :href="route('profile.edit')" icon="cog" wire:navigate>{{ __('Settings') }}</flux:menu.item>
                     </flux:menu.radio.group>
 
                     <flux:menu.separator />
@@ -110,7 +110,7 @@ class="flex h-full w-full items-center justify-center rounded-lg bg-neutral-200
                     <flux:menu.separator />
 
                     <flux:menu.radio.group>
-                        <flux:menu.item :href="route('settings.profile')" icon="cog" wire:navigate>{{ __('Settings') }}</flux:menu.item>
+                        <flux:menu.item :href="route('profile.edit')" icon="cog" wire:navigate>{{ __('Settings') }}</flux:menu.item>
                     </flux:menu.radio.group>
 
                     <flux:menu.separator />
diff --git a/resources/views/components/settings/layout.blade.php b/resources/views/components/settings/layout.blade.php
@@ -1,12 +1,12 @@
 <div class="flex items-start max-md:flex-col">
     <div class="me-10 w-full pb-4 md:w-[220px]">
         <flux:navlist>
-            <flux:navlist.item :href="route('settings.profile')" wire:navigate>{{ __('Profile') }}</flux:navlist.item>
-            <flux:navlist.item :href="route('settings.user-password')" wire:navigate>{{ __('Password') }}</flux:navlist.item>
+            <flux:navlist.item :href="route('profile.edit')" wire:navigate>{{ __('Profile') }}</flux:navlist.item>
+            <flux:navlist.item :href="route('user-password.edit')" wire:navigate>{{ __('Password') }}</flux:navlist.item>
             @if (Laravel\Fortify\Features::canManageTwoFactorAuthentication())
                 <flux:navlist.item :href="route('two-factor.show')" wire:navigate>{{ __('Two-Factor Auth') }}</flux:navlist.item>
             @endif
-            <flux:navlist.item :href="route('settings.appearance')" wire:navigate>{{ __('Appearance') }}</flux:navlist.item>
+            <flux:navlist.item :href="route('appearance.edit')" wire:navigate>{{ __('Appearance') }}</flux:navlist.item>
         </flux:navlist>
     </div>
 
diff --git a/routes/web.php b/routes/web.php
@@ -18,9 +18,9 @@
 Route::middleware(['auth'])->group(function () {
     Route::redirect('settings', 'settings/profile');
 
-    Route::get('settings/profile', Profile::class)->name('settings.profile');
-    Route::get('settings/password', Password::class)->name('settings.user-password');
-    Route::get('settings/appearance', Appearance::class)->name('settings.appearance');
+    Route::get('settings/profile', Profile::class)->name('profile.edit');
+    Route::get('settings/password', Password::class)->name('user-password.edit');
+    Route::get('settings/appearance', Appearance::class)->name('appearance.edit');
 
     Route::get('settings/two-factor', TwoFactor::class)
         ->middleware(
diff --git a/tests/Feature/Auth/AuthenticationTest.php b/tests/Feature/Auth/AuthenticationTest.php
@@ -2,11 +2,9 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Livewire\Auth\Login;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Fortify\Features;
-use Livewire\Livewire;
 use Tests\TestCase;
 
 class AuthenticationTest extends TestCase
@@ -15,22 +13,21 @@ class AuthenticationTest extends TestCase
 
     public function test_login_screen_can_be_rendered(): void
     {
-        $response = $this->get('/login');
-
+        $response = $this->get(route('login'));
         $response->assertStatus(200);
     }
 
     public function test_users_can_authenticate_using_the_login_screen(): void
     {
         $user = User::factory()->withoutTwoFactor()->create();
 
-        $response = Livewire::test(Login::class)
-            ->set('email', $user->email)
-            ->set('password', 'password')
-            ->call('login');
+        $response = $this->post(route('login.store'), [
+            'email' => $user->email,
+            'password' => 'password',
+        ]);
 
         $response
-            ->assertHasNoErrors()
+            ->assertSessionHasNoErrors()
             ->assertRedirect(route('dashboard', absolute: false));
 
         $this->assertAuthenticated();
@@ -40,12 +37,12 @@ public function test_users_can_not_authenticate_with_invalid_password(): void
     {
         $user = User::factory()->create();
 
-        $response = Livewire::test(Login::class)
-            ->set('email', $user->email)
-            ->set('password', 'wrong-password')
-            ->call('login');
+        $response = $this->post(route('login.store'), [
+            'email' => $user->email,
+            'password' => 'wrong-password',
+        ]);
 
-        $response->assertHasErrors('email');
+        $response->assertSessionHasErrorsIn('email');
 
         $this->assertGuest();
     }
@@ -55,38 +52,27 @@ public function test_users_with_two_factor_enabled_are_redirected_to_two_factor_
         if (! Features::canManageTwoFactorAuthentication()) {
             $this->markTestSkipped('Two-factor authentication is not enabled.');
         }
-
         Features::twoFactorAuthentication([
             'confirm' => true,
             'confirmPassword' => true,
         ]);
 
         $user = User::factory()->create();
 
-        $user->forceFill([
-            'two_factor_secret' => encrypt('test-secret'),
-            'two_factor_recovery_codes' => encrypt(json_encode(['code1', 'code2'])),
-            'two_factor_confirmed_at' => now(),
-        ])->save();
-
-        $response = Livewire::test('auth.login')
-            ->set('email', $user->email)
-            ->set('password', 'password')
-            ->call('login');
+        $response = $this->post(route('login.store'), [
+            'email' => $user->email,
+            'password' => 'password',
+        ]);
 
         $response->assertRedirect(route('two-factor.login'));
-        $response->assertSessionHas('login.id', $user->id);
         $this->assertGuest();
     }
 
     public function test_users_can_logout(): void
     {
         $user = User::factory()->create();
-
-        $response = $this->actingAs($user)->post('/logout');
-
-        $response->assertRedirect('/');
-
+        $response = $this->actingAs($user)->post(route('logout'));
+        $response->assertRedirect(route('home'));
         $this->assertGuest();
     }
 }
diff --git a/tests/Feature/Auth/EmailVerificationTest.php b/tests/Feature/Auth/EmailVerificationTest.php
@@ -17,7 +17,7 @@ public function test_email_verification_screen_can_be_rendered(): void
     {
         $user = User::factory()->unverified()->create();
 
-        $response = $this->actingAs($user)->get('/verify-email');
+        $response = $this->actingAs($user)->get(route('verification.notice'));
 
         $response->assertStatus(200);
     }
diff --git a/tests/Feature/Auth/PasswordResetTest.php b/tests/Feature/Auth/PasswordResetTest.php
@@ -2,13 +2,10 @@
 
 namespace Tests\Feature\Auth;
 
-use App\Livewire\Auth\ForgotPassword;
-use App\Livewire\Auth\ResetPassword;
 use App\Models\User;
-use Illuminate\Auth\Notifications\ResetPassword as ResetPasswordNotification;
+use Illuminate\Auth\Notifications\ResetPassword;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Notification;
-use Livewire\Livewire;
 use Tests\TestCase;
 
 class PasswordResetTest extends TestCase
@@ -17,8 +14,7 @@ class PasswordResetTest extends TestCase
 
     public function test_reset_password_link_screen_can_be_rendered(): void
     {
-        $response = $this->get('/forgot-password');
-
+        $response = $this->get(route('password.request'));
         $response->assertStatus(200);
     }
 
@@ -28,11 +24,9 @@ public function test_reset_password_link_can_be_requested(): void
 
         $user = User::factory()->create();
 
-        Livewire::test(ForgotPassword::class)
-            ->set('email', $user->email)
-            ->call('sendPasswordResetLink');
+        $this->post(route('password.request'), ['email' => $user->email]);
 
-        Notification::assertSentTo($user, ResetPasswordNotification::class);
+        Notification::assertSentTo($user, ResetPassword::class);
     }
 
     public function test_reset_password_screen_can_be_rendered(): void
@@ -41,13 +35,10 @@ public function test_reset_password_screen_can_be_rendered(): void
 
         $user = User::factory()->create();
 
-        Livewire::test(ForgotPassword::class)
-            ->set('email', $user->email)
-            ->call('sendPasswordResetLink');
-
-        Notification::assertSentTo($user, ResetPasswordNotification::class, function ($notification) {
-            $response = $this->get('/reset-password/'.$notification->token);
+        $this->post(route('password.request'), ['email' => $user->email]);
 
+        Notification::assertSentTo($user, ResetPassword::class, function ($notification) {
+            $response = $this->get(route('password.reset', $notification->token));
             $response->assertStatus(200);
 
             return true;
@@ -60,19 +51,18 @@ public function test_password_can_be_reset_with_valid_token(): void
 
         $user = User::factory()->create();
 
-        Livewire::test(ForgotPassword::class)
-            ->set('email', $user->email)
-            ->call('sendPasswordResetLink');
+        $this->post(route('password.request'), ['email' => $user->email]);
 
-        Notification::assertSentTo($user, ResetPasswordNotification::class, function ($notification) use ($user) {
-            $response = Livewire::test(ResetPassword::class, ['token' => $notification->token])
-                ->set('email', $user->email)
-                ->set('password', 'password')
-                ->set('password_confirmation', 'password')
-                ->call('resetPassword');
+        Notification::assertSentTo($user, ResetPassword::class, function ($notification) use ($user) {
+            $response = $this->post(route('password.update'), [
+                'token' => $notification->token,
+                'email' => $user->email,
+                'password' => 'password',
+                'password_confirmation' => 'password',
+            ]);
 
             $response
-                ->assertHasNoErrors()
+                ->assertSessionHasNoErrors()
                 ->assertRedirect(route('login', absolute: false));
 
             return true;
diff --git a/tests/Feature/Auth/TwoFactorChallengeTest.php b/tests/Feature/Auth/TwoFactorChallengeTest.php
@@ -5,7 +5,6 @@
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Fortify\Features;
-use Livewire\Livewire;
 use Tests\TestCase;
 
 class TwoFactorChallengeTest extends TestCase
@@ -17,9 +16,7 @@ public function test_two_factor_challenge_redirects_to_login_when_not_authentica
         if (! Features::canManageTwoFactorAuthentication()) {
             $this->markTestSkipped('Two-factor authentication is not enabled.');
         }
-
         $response = $this->get(route('two-factor.login'));
-
         $response->assertRedirect(route('login'));
     }
 
@@ -28,25 +25,16 @@ public function test_two_factor_challenge_can_be_rendered(): void
         if (! Features::canManageTwoFactorAuthentication()) {
             $this->markTestSkipped('Two-factor authentication is not enabled.');
         }
-
         Features::twoFactorAuthentication([
             'confirm' => true,
             'confirmPassword' => true,
         ]);
 
         $user = User::factory()->create();
 
-        $user->forceFill([
-            'two_factor_secret' => encrypt('test-secret'),
-            'two_factor_recovery_codes' => encrypt(json_encode(['code1', 'code2'])),
-            'two_factor_confirmed_at' => now(),
-        ])->save();
-
-        Livewire::test('auth.login')
-            ->set('email', $user->email)
-            ->set('password', 'password')
-            ->call('login')
-            ->assertRedirect(route('two-factor.login'))
-            ->assertOk();
+        $this->post(route('login.store'), [
+            'email' => $user->email,
+            'password' => 'password',
+        ])->assertRedirect(route('two-factor.login'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function test_email_verification_screen_can_be_rendered(): void`
`17`	`17`	`{`
`18`	`18`	`$user = User::factory()->unverified()->create();`
`19`	`19`
`20`		`- $response = $this->actingAs($user)->get('/verify-email');`
	`20`	`+ $response = $this->actingAs($user)->get(route('verification.notice'));`
`21`	`21`
`22`	`22`	`$response->assertStatus(200);`
`23`	`23`	`}`