fix: all test

datamweb · Nov 15, 2023 · 9c36b02 · 9c36b02
1 parent 6054e56
commit 9c36b02
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 35 deletions.
diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -12,4 +12,15 @@
     'count' => 1,
     'path' => __DIR__ . '/tests/_support/Config/Registrar.php',
 ];
+$ignoreErrors[] = [
+    'message' => '#^Property Tests\\\\Validation\\\\DEAValidatorTest\\:\\:\\$config type has no value type specified in iterable type array\\.$#',
+    'count' => 1,
+    'path' => __DIR__ . '/tests/Validation/DEAValidatorTest.php',
+];
+$ignoreErrors[] = [
+    'message' => '#^Parameter \\#1 \\$config of class CodeIgniter\\\\Validation\\\\Validation constructor expects Config\\\\Validation, stdClass given\\.$#',
+    'count' => 1,
+    'path' => __DIR__ . '/tests/Validation/DEAValidatorTest.php',
+];
+
 return ['parameters' => ['ignoreErrors' => $ignoreErrors]];
diff --git a/rector.php b/rector.php
@@ -93,6 +93,7 @@
 
         TypedPropertyFromAssignsRector::class => [
             __DIR__ . '/src/Models/LogsTempEmailModel.php',
+            __DIR__ . '/tests/Validation/DEAValidatorTest.php',
             __DIR__ . '/src/Commands/DEARulePublish.php',
             __DIR__ . '/tests/_support/Config/Registrar.php',
         ],

diff --git a/tests/Validation/DEAValidatorTest.php b/tests/Validation/DEAValidatorTest.php
@@ -16,9 +16,10 @@
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
-use CodeIgniter\Validation\ValidationInterface;
+use CodeIgniter\Validation\Validation;
 use Config\Services;
 use Datamweb\CodeIgniterDEARule\Config\DEARule;
+use Datamweb\CodeIgniterDEARule\Validation\DEAValidator;
 
 /**
  * @internal
@@ -27,19 +28,22 @@ final class DEAValidatorTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    private ValidationInterface $validation;
+    private Validation $validation;
+    private array $config = [
+        'ruleSets' => [
+            DEAValidator::class,
+        ],
+    ];
 
     protected function setUp(): void
     {
         parent::setUp();
-        $this->validation = Services::validation();
+        $this->validation = $this->validation = new Validation((object) $this->config, Services::renderer());
         $this->validation->reset();
 
         /** @var DEARule $config */
         $config                                     = config('DEARule');
         $config->recordedAttemptsIfDisposableEmails = false;
-
-        Factories::injectMock('config', 'DEARule', $config);
     }
 
     /**
@@ -131,20 +135,20 @@ public static function provideIsTempEmailByMutiDBFiles(): iterable
      *
      * @param array<string, string> $data
      */
-    // public function testIsTempEmailByDomainBlacklisted(array $data, bool $expected): void
-    // {
-    //     /** @var DEARule $config */
-    //     $config                    = config('DEARule');
-    //     $config->domainBlacklisted = [
-    //         'not-allowed-to-register.com',
-    //         'not-allowed-to-login.com',
-    //     ];
+    public function testIsTempEmailByDomainBlacklisted(array $data, bool $expected): void
+    {
+        /** @var DEARule $config */
+        $config                    = config('DEARule');
+        $config->domainBlacklisted = [
+            'not-allowed-to-register.com',
+            'not-allowed-to-login.com',
+        ];
 
-    //     Factories::injectMock('config', 'DEARule', $config);
+        Factories::injectMock('config', 'DEARule', $config);
 
-    //     $this->validation->setRules(['email' => 'is_temp_email']);
-    //     $this->assertSame($expected, $this->validation->run($data));
-    // }
+        $this->validation->setRules(['email' => 'is_temp_email']);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
 
     /**
      * @return array<array<array<string, string>|bool>> $data
@@ -166,24 +170,24 @@ public static function provideIsTempEmailByDomainBlacklisted(): iterable
      *
      * @param array<string, string> $data
      */
-    // public function testEmailIsDomainBlacklistedButEmailsWhiteListed(array $data, bool $expected): void
-    // {
-    //     /** @var DEARule $config */
-    //     $config                    = config('DEARule');
-    //     $config->domainBlacklisted = [
-    //         'not-allowed-to-register.com',
-    //         'not-allowed-to-login.com',
-    //     ];
-    //     $config->emailsWhiteListed = [
-    //         'foo@not-allowed-to-register.com',
-    //         'foo@not-allowed-to-login.com',
-    //     ];
-
-    //     Factories::injectMock('config', 'DEARule', $config);
-
-    //     $this->validation->setRules(['email' => 'is_temp_email']);
-    //     $this->assertSame($expected, $this->validation->run($data));
-    // }
+    public function testEmailIsDomainBlacklistedButEmailsWhiteListed(array $data, bool $expected): void
+    {
+        /** @var DEARule $config */
+        $config                    = config('DEARule');
+        $config->domainBlacklisted = [
+            'not-allowed-to-register.com',
+            'not-allowed-to-login.com',
+        ];
+        $config->emailsWhiteListed = [
+            'foo@not-allowed-to-register.com',
+            'foo@not-allowed-to-login.com',
+        ];
+
+        Factories::injectMock('config', 'DEARule', $config);
+
+        $this->validation->setRules(['email' => 'is_temp_email']);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
 
     /**
      * @return array<array<array<string, string>|bool>> $data