Use a data provider to clean up the test

Author: jasonvarga

tests/Http/Middleware/SelectedSiteTest.php

@@ -3,6 +3,7 @@
 namespace Tests\Http\Middleware;
 
 use Illuminate\Http\Request;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Facades\Site;
 use Statamic\Facades\User;
@@ -81,13 +82,12 @@ public function it_doesnt_do_anything_when_there_are_no_authorized_sites()
         $this->assertEquals('de', Site::selected()->handle());
     }
 
-    #[Test]
-    public function it_sets_the_correct_site_when_first_logging_in()
+    #[Test, DataProvider('firstLoginProvider')]
+    public function it_sets_the_correct_site_when_first_logging_in($existingSelection, $url, $expectedSelection)
     {
         $this->setSites([
             'en' => ['url' => 'https://en.test', 'locale' => 'en'],
             'fr' => ['url' => 'https://fr.test', 'locale' => 'fr'],
-            'de' => ['url' => 'https://de.test', 'locale' => 'de'],
         ]);
 
         $this->setTestRoles(['test' => [
@@ -96,22 +96,10 @@ public function it_sets_the_correct_site_when_first_logging_in()
         $user = tap(User::make()->assignRole('test'))->save();
 
         $this->actingAs($user);
-        $request = $this->createRequest('https://fr.test/cp/foo');
+        $request = $this->createRequest($url);
         $handled = false;
 
-        (new SelectedSite())->handle($request, function () use (&$handled) {
-            $handled = true;
-
-            return new Response;
-        });
-
-        $this->assertTrue($handled);
-        $this->assertEquals('fr', Site::selected()->handle());
-
-        Site::setSelected('en');
-
-        $request = $this->createRequest('https://fr.test/cp/bar');
-        $handled = false;
+        $this->session(['statamic.cp.selected-site' => $existingSelection]);
 
         (new SelectedSite())->handle($request, function () use (&$handled) {
             $handled = true;
@@ -120,7 +108,26 @@ public function it_sets_the_correct_site_when_first_logging_in()
         });
 
         $this->assertTrue($handled);
-        $this->assertEquals('en', Site::selected()->handle());
+        $this->assertEquals($expectedSelection, Site::selected()->handle());
+    }
+
+    public static function firstLoginProvider()
+    {
+        $enUrl = 'https://en.test/cp/foo';
+        $frUrl = 'https://fr.test/cp/foo';
+        $unknownUrl = 'https://unknown.test/cp/foo';
+
+        return [
+            'en site: fresh session' => [null, $enUrl, 'en'],
+            'en site: existing en session' => ['en', $enUrl, 'en'],
+            'en site: existing fr session' => ['fr', $enUrl, 'fr'],
+            'fr site: fresh session' => [null, $frUrl, 'fr'],
+            'fr site: existing fr session' => ['fr', $frUrl, 'fr'],
+            'fr site: existing en session' => ['en', $frUrl, 'en'],
+            'unknown site: fresh session' => [null, $unknownUrl, 'en'],
+            'unknown site: existing en session' => ['en', $unknownUrl, 'en'],
+            'unknown site: existing fr session' => ['fr', $unknownUrl, 'fr'],
+        ];
     }
 
     #[Test]