diff --git a/app-modules/panel-app/tests/Feature/ConnectionHubTest.php b/app-modules/panel-app/tests/Feature/ConnectionHubTest.php new file mode 100644 index 000000000..a8dc49331 --- /dev/null +++ b/app-modules/panel-app/tests/Feature/ConnectionHubTest.php @@ -0,0 +1,25 @@ +create(); + $mergeTarget = User::factory()->create(); + + $this->actingAs($currentUser); + + session()->put('oauth_merge_pending', [ + 'conflicting_user_id' => $mergeTarget->id, + ]); + + livewire(ConnectionHub::class) + ->assertSet('showMergeModal', value: true) + ->assertSeeHtml('role="dialog"') + ->assertSeeHtml('aria-modal="true"') + ->assertSeeHtml('@keydown.escape.window="$wire.cancelMerge()"'); +}); diff --git a/resources/views/livewire/connection-hub.blade.php b/resources/views/livewire/connection-hub.blade.php index a419c0789..2ad5b99aa 100644 --- a/resources/views/livewire/connection-hub.blade.php +++ b/resources/views/livewire/connection-hub.blade.php @@ -145,49 +145,54 @@ class="rounded bg-gray-100 px-1 py-0.5 font-mono text-[9px] text-gray-500 ring-1 {{-- Merge Confirmation Modal --}} @if ($showMergeModal && $mergeTarget) -
Já existe uma conta vinculada a esse provedor:
-Já existe uma conta vinculada a esse provedor:
+ +Ao unificar, sua conta atual será absorvida por essa conta e você será relogado automaticamente.
+Ao unificar, sua conta atual será absorvida por essa conta e você será relogado automaticamente.
-