Fix: tests

Author: tatevikg1

tests/Integration/Identity/Controller/SessionControllerTest.php

@@ -100,7 +100,7 @@ public function testPostSessionsWithInvalidCredentialsReturnsNotAuthorized()
     {
         $this->loadFixtures([AdministratorFixture::class]);
 
-        $loginName = 'john.doe';
+        $loginName = 'john.doe.1';
         $password = 'a sandwich and a cup of coffee';
         $jsonData = ['login_name' => $loginName, 'password' => $password];
 

tests/Integration/Identity/Fixtures/AdministratorFixture.php

@@ -29,13 +29,21 @@ public function load(ObjectManager $manager): void
 
         $headers = fgetcsv($handle);
 
+        $adminRepository = $manager->getRepository(Administrator::class);
+
         do {
             $data = fgetcsv($handle);
             if ($data === false) {
                 break;
             }
             $row = array_combine($headers, $data);
 
+            // Make fixture idempotent: skip if admin with this ID already exists
+            $existing = $adminRepository->find($row['id']);
+            if ($existing instanceof Administrator) {
+                continue;
+            }
+
             $admin = new Administrator();
             $this->setSubjectId($admin, (int)$row['id']);
             $admin->setLoginName($row['loginname']);

tests/Integration/Identity/Fixtures/AdministratorTokenFixture.php

@@ -42,14 +42,15 @@ public function load(ObjectManager $manager): void
             if ($admin === null) {
                 $admin = new Administrator();
                 $this->setSubjectId($admin, (int)$row['adminid']);
+                // Use a deterministic, non-conflicting login name to avoid clashes with other fixtures
+                $admin->setLoginName('admin_' . $row['adminid']);
                 $admin->setSuperUser(true);
                 $manager->persist($admin);
             }
 
-            $adminToken = new AdministratorToken();
+            $adminToken = new AdministratorToken($admin);
             $this->setSubjectId($adminToken, (int)$row['id']);
             $adminToken->setKey($row['value']);
-            $adminToken->setAdministrator($admin);
             $manager->persist($adminToken);
 
             $this->setSubjectProperty($adminToken, 'expiry', new DateTime($row['expires']));

tests/Integration/Subscription/Fixtures/SubscriberListFixture.php

@@ -31,6 +31,7 @@ public function load(ObjectManager $manager): void
         $headers = fgetcsv($handle);
 
         $adminRepository = $manager->getRepository(Administrator::class);
+        $adminsById = [];
 
         do {
             $data = fgetcsv($handle);
@@ -39,13 +40,24 @@ public function load(ObjectManager $manager): void
             }
             $row = array_combine($headers, $data);
 
-            $admin = $adminRepository->find($row['owner']);
+            $ownerId = (int)$row['owner'];
+            $admin = $adminsById[$ownerId] ?? $adminRepository->find($ownerId);
             if ($admin === null) {
-                $admin = new Administrator();
-                $this->setSubjectId($admin, (int)$row['owner']);
-                $admin->setSuperUser(true);
-                $admin->setDisabled(false);
-                $manager->persist($admin);
+                // Try to reuse an existing admin with our deterministic login name
+                $existingByLogin = $adminRepository->findOneBy(['loginName' => 'owner_' . $ownerId]);
+                if ($existingByLogin instanceof Administrator) {
+                    $admin = $existingByLogin;
+                    $adminsById[$ownerId] = $admin;
+                } else {
+                    $admin = new Administrator();
+                    $this->setSubjectId($admin, $ownerId);
+                    // Use a deterministic, non-conflicting login name to avoid clashes with other fixtures
+                    $admin->setLoginName('owner_' . $ownerId);
+                    $admin->setSuperUser(true);
+                    $admin->setDisabled(false);
+                    $manager->persist($admin);
+                    $adminsById[$ownerId] = $admin;
+                }
             }
 
             $subscriberList = new SubscriberList();