apply suggestions from code review: removed testForceGlobalPasswordRe…

…set() from UserIdentityModelTest
codeigniter4 · Jan 16, 2023 · b30dd31 · b30dd31
1 parent 44a7e59
commit b30dd31
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 27 deletions.
diff --git a/tests/Authentication/ForcePasswordResetTest.php b/tests/Authentication/ForcePasswordResetTest.php
@@ -9,6 +9,7 @@
 use CodeIgniter\Shield\Models\UserModel;
 use CodeIgniter\Shield\Test\AuthenticationTesting;
 use CodeIgniter\Test\DatabaseTestTrait;
+use CodeIgniter\Test\Fabricator;
 use CodeIgniter\Test\FeatureTestTrait;
 use Config\Services;
 use Tests\Support\TestCase;
@@ -100,4 +101,29 @@ public function testRequiresPasswordResetRedirect(): void
         $result->assertStatus(302);
         $result->assertRedirectTo(config('Auth')->forcePasswordResetRedirect());
     }
+
+    public function testForceGlobalPasswordReset(): void
+    {
+        /**
+         * @phpstan-var User
+         */
+        $user = fake(UserModel::class);
+        $user->createEmailIdentity(['email' => 'foo@example.com', 'password' => 'secret123']);
+        $this->actingAs($user);
+
+        /**
+         * @phpstan-var Fabricator
+         */
+        $fabricator = new Fabricator(UserIdentityModel::class);
+        $fabricator->create(100);
+
+        /**
+         * @phpstan-var UserIdentityModel
+         */
+        $identities = model(UserIdentityModel::class);
+
+        $response = $identities->forceGlobalPasswordReset();
+        $this->assertTrue($response);
+        $this->assertFalse($user->requiresPasswordReset());
+    }
 }
diff --git a/tests/Unit/UserIdentityModelTest.php b/tests/Unit/UserIdentityModelTest.php
@@ -9,7 +9,6 @@
 use CodeIgniter\Shield\Models\DatabaseException;
 use CodeIgniter\Shield\Models\UserIdentityModel;
 use CodeIgniter\Shield\Models\UserModel;
-use CodeIgniter\Shield\Test\AuthenticationTesting;
 use CodeIgniter\Test\DatabaseTestTrait;
 use CodeIgniter\Test\Fabricator;
 use Tests\Support\TestCase;
@@ -20,7 +19,6 @@
 final class UserIdentityModelTest extends TestCase
 {
     use DatabaseTestTrait;
-    use AuthenticationTesting;
 
     protected $namespace;
     protected $refresh = true;
@@ -98,29 +96,4 @@ public function testForceMultiplePasswordReset(): void
         $response = $identities->forceMultiplePasswordReset($userIds);
         $this->assertTrue($response);
     }
-
-    public function testforceGlobalPasswordReset(): void
-    {
-        /**
-         * @phpstan-var User
-         */
-        $user = fake(UserModel::class);
-        $user->createEmailIdentity(['email' => 'foo@example.com', 'password' => 'secret123']);
-        $this->actingAs($user);
-
-        /**
-         * @phpstan-var Fabricator
-         */
-        $fabricator = new Fabricator(UserIdentityModel::class);
-        $fabricator->create(100);
-
-        /**
-         * @phpstan-var UserIdentityModel
-         */
-        $identities = model(UserIdentityModel::class);
-
-        $response = $identities->forceGlobalPasswordReset();
-        $this->assertTrue($response);
-        $this->assertFalse($user->requiresPasswordReset());
-    }
 }