Рефакторинг api unit тестов

tests/codeception/api/unit/models/profile/AcceptRulesFormTest.php

@@ -2,32 +2,25 @@
 namespace codeception\api\unit\models\profile;
 
 use api\models\profile\AcceptRulesForm;
-use Codeception\Specify;
 use common\models\Account;
-use tests\codeception\api\unit\DbTestCase;
+use tests\codeception\api\unit\TestCase;
 use tests\codeception\common\fixtures\AccountFixture;
 use const common\LATEST_RULES_VERSION;
 
-/**
- * @property AccountFixture $accounts
- */
-class AcceptRulesFormTest extends DbTestCase {
-    use Specify;
+class AcceptRulesFormTest extends TestCase {
 
-    public function fixtures() {
+    public function _fixtures() {
         return [
             'accounts' => AccountFixture::class,
         ];
     }
 
-    public function testApplyLanguage() {
-        $this->specify('rules version bumped to latest', function() {
-            /** @var Account $account */
-            $account = Account::findOne($this->accounts['account-with-old-rules-version']);
-            $model = new AcceptRulesForm($account);
-            expect($model->agreeWithLatestRules())->true();
-            expect($account->rules_agreement_version)->equals(LATEST_RULES_VERSION);
-        });
+    public function testAgreeWithLatestRules() {
+        /** @var Account $account */
+        $account = Account::findOne($this->tester->grabFixture('accounts', 'account-with-old-rules-version'));
+        $model = new AcceptRulesForm($account);
+        $this->assertTrue($model->agreeWithLatestRules());
+        $this->assertEquals(LATEST_RULES_VERSION, $account->rules_agreement_version);
     }
 
 }

tests/codeception/api/unit/models/profile/ChangeEmail/ConfirmNewEmailFormTest.php

@@ -2,46 +2,36 @@
 namespace codeception\api\unit\models\profile\ChangeEmail;
 
 use api\models\profile\ChangeEmail\ConfirmNewEmailForm;
-use Codeception\Specify;
 use common\models\Account;
 use common\models\EmailActivation;
-use tests\codeception\api\unit\DbTestCase;
+use tests\codeception\api\unit\TestCase;
 use tests\codeception\common\fixtures\AccountFixture;
 use tests\codeception\common\fixtures\EmailActivationFixture;
-use Yii;
 
-/**
- * @property AccountFixture $accounts
- * @property EmailActivationFixture $emailActivations
- */
-class ConfirmNewEmailFormTest extends DbTestCase {
-    use Specify;
+class ConfirmNewEmailFormTest extends TestCase {
 
-    public function fixtures() {
+    public function _fixtures() {
         return [
-            'accounts' => [
-                'class' => AccountFixture::class,
-                'dataFile' => '@tests/codeception/common/fixtures/data/accounts.php',
-            ],
+            'accounts' => AccountFixture::class,
             'emailActivations' => EmailActivationFixture::class,
         ];
     }
 
     public function testChangeEmail() {
-        $this->specify('successfully change account email', function() {
-            /** @var Account $account */
-            $account = Account::findOne($this->accounts['account-with-change-email-finish-state']['id']);
-            $model = new ConfirmNewEmailForm($account, [
-                'key' => $this->emailActivations['newEmailConfirmation']['key'],
-            ]);
-            expect($model->changeEmail())->true();
-            expect(EmailActivation::findOne([
-                'account_id' => $account->id,
-                'type' => EmailActivation::TYPE_NEW_EMAIL_CONFIRMATION,
-            ]))->null();
-            $data = unserialize($this->emailActivations['newEmailConfirmation']['_data']);
-            expect($account->email)->equals($data['newEmail']);
-        });
+        $accountId = $this->tester->grabFixture('accounts', 'account-with-change-email-finish-state')['id'];
+        /** @var Account $account */
+        $account = Account::findOne($accountId);
+        $newEmailConfirmationFixture = $this->tester->grabFixture('emailActivations', 'newEmailConfirmation');
+        $model = new ConfirmNewEmailForm($account, [
+            'key' => $newEmailConfirmationFixture['key'],
+        ]);
+        $this->assertTrue($model->changeEmail());
+        $this->assertNull(EmailActivation::findOne([
+            'account_id' => $account->id,
+            'type' => EmailActivation::TYPE_NEW_EMAIL_CONFIRMATION,
+        ]));
+        $data = unserialize($newEmailConfirmationFixture['_data']);
+        $this->assertEquals($data['newEmail'], $account->email);
     }
 
 }

tests/codeception/api/unit/models/profile/ChangeEmail/InitStateFormTest.php

@@ -2,82 +2,44 @@
 namespace codeception\api\unit\models\profile\ChangeEmail;
 
 use api\models\profile\ChangeEmail\InitStateForm;
-use Codeception\Specify;
 use common\models\Account;
 use common\models\confirmations\CurrentEmailConfirmation;
 use common\models\EmailActivation;
-use tests\codeception\api\unit\DbTestCase;
+use tests\codeception\api\unit\TestCase;
 use tests\codeception\common\fixtures\AccountFixture;
 use tests\codeception\common\fixtures\EmailActivationFixture;
-use Yii;
 
-/**
- * @property AccountFixture $accounts
- * @property EmailActivationFixture $emailActivations
- */
-class InitStateFormTest extends DbTestCase {
-    use Specify;
+class InitStateFormTest extends TestCase {
 
-    public function setUp() {
-        parent::setUp();
-        /** @var \yii\swiftmailer\Mailer $mailer */
-        $mailer = Yii::$app->mailer;
-        $mailer->fileTransportCallback = function () {
-            return 'testing_message.eml';
-        };
-    }
-
-    protected function tearDown() {
-        if (file_exists($this->getMessageFile())) {
-            unlink($this->getMessageFile());
-        }
-
-        parent::tearDown();
-    }
-
-    public function fixtures() {
+    public function _fixtures() {
         return [
-            'accounts' => [
-                'class' => AccountFixture::class,
-                'dataFile' => '@tests/codeception/common/fixtures/data/accounts.php',
-            ],
+            'accounts' => AccountFixture::class,
             'emailActivations' => EmailActivationFixture::class,
         ];
     }
 
     public function testCreateCode() {
-        $this->specify('create valid code and store it to database', function() {
-            /** @var Account $account */
-            $account = Account::findOne($this->accounts['admin']['id']);
-            $model = new InitStateForm($account);
-            $activationModel = $model->createCode();
-            expect($activationModel)->isInstanceOf(CurrentEmailConfirmation::class);
-            expect($activationModel->account_id)->equals($account->id);
-            expect(EmailActivation::findOne($activationModel->key))->notNull();
-        });
+        /** @var Account $account */
+        $account = $this->tester->grabFixture('accounts', 'admin');
+        $model = new InitStateForm($account);
+        $activationModel = $model->createCode();
+        $this->assertInstanceOf(CurrentEmailConfirmation::class, $activationModel);
+        $this->assertEquals($account->id, $activationModel->account_id);
+        $this->assertNotNull(EmailActivation::findOne($activationModel->key));
     }
 
     public function testSendCurrentEmailConfirmation() {
-        $this->specify('send email', function() {
-            /** @var Account $account */
-            $account = Account::findOne($this->accounts['admin']['id']);
-            $model = new InitStateForm($account, [
-                'password' => 'password_0',
-            ]);
-            expect($model->sendCurrentEmailConfirmation())->true();
-            expect(EmailActivation::find()->andWhere([
-                'account_id' => $account->id,
-                'type' => EmailActivation::TYPE_CURRENT_EMAIL_CONFIRMATION,
-            ])->exists())->true();
-            expect_file($this->getMessageFile())->exists();
-        });
-    }
-
-    private function getMessageFile() {
-        /** @var \yii\swiftmailer\Mailer $mailer */
-        $mailer = Yii::$app->mailer;
-
-        return Yii::getAlias($mailer->fileTransportPath) . '/testing_message.eml';
+        /** @var Account $account */
+        $account = $this->tester->grabFixture('accounts', 'admin');
+        $model = new InitStateForm($account, [
+            'password' => 'password_0',
+        ]);
+        $this->assertTrue($model->sendCurrentEmailConfirmation());
+        $this->assertTrue(EmailActivation::find()->andWhere([
+            'account_id' => $account->id,
+            'type' => EmailActivation::TYPE_CURRENT_EMAIL_CONFIRMATION,
+        ])->exists());
+        $this->tester->canSeeEmailIsSent();
     }
 
 }

tests/codeception/api/unit/models/profile/ChangeEmail/NewEmailFormTest.php

@@ -2,87 +2,50 @@
 namespace codeception\api\unit\models\profile\ChangeEmail;
 
 use api\models\profile\ChangeEmail\NewEmailForm;
-use Codeception\Specify;
 use common\models\Account;
 use common\models\confirmations\NewEmailConfirmation;
 use common\models\EmailActivation;
-use tests\codeception\api\unit\DbTestCase;
+use tests\codeception\api\unit\TestCase;
 use tests\codeception\common\fixtures\AccountFixture;
 use tests\codeception\common\fixtures\EmailActivationFixture;
-use Yii;
 
-/**
- * @property AccountFixture $accounts
- * @property EmailActivationFixture $emailActivations
- */
-class NewEmailFormTest extends DbTestCase {
-    use Specify;
+class NewEmailFormTest extends TestCase {
 
-    public function setUp() {
-        parent::setUp();
-        /** @var \yii\swiftmailer\Mailer $mailer */
-        $mailer = Yii::$app->mailer;
-        $mailer->fileTransportCallback = function () {
-            return 'testing_message.eml';
-        };
-    }
-
-    protected function tearDown() {
-        if (file_exists($this->getMessageFile())) {
-            unlink($this->getMessageFile());
-        }
-
-        parent::tearDown();
-    }
-
-    public function fixtures() {
+    public function _fixtures() {
         return [
-            'accounts' => [
-                'class' => AccountFixture::class,
-                'dataFile' => '@tests/codeception/common/fixtures/data/accounts.php',
-            ],
+            'accounts' => AccountFixture::class,
             'emailActivations' => EmailActivationFixture::class,
         ];
     }
 
     public function testCreateCode() {
-        $this->specify('create valid code and store it to database', function() {
-            /** @var Account $account */
-            $account = Account::findOne($this->accounts['admin']['id']);
-            $model = new NewEmailForm($account);
-            $model->email = 'my-new-email@ely.by';
-            $activationModel = $model->createCode();
-            expect($activationModel)->isInstanceOf(NewEmailConfirmation::class);
-            expect($activationModel->account_id)->equals($account->id);
-            expect($activationModel->newEmail)->equals($model->email);
-            expect(EmailActivation::findOne($activationModel->key))->notNull();
-        });
+        /** @var Account $account */
+        $account = $this->tester->grabFixture('accounts', 'admin');
+        $model = new NewEmailForm($account);
+        $model->email = 'my-new-email@ely.by';
+        $activationModel = $model->createCode();
+        $this->assertInstanceOf(NewEmailConfirmation::class, $activationModel);
+        $this->assertEquals($account->id, $activationModel->account_id);
+        $this->assertEquals($model->email, $activationModel->newEmail);
+        $this->assertNotNull(EmailActivation::findOne($activationModel->key));
     }
 
     public function testSendNewEmailConfirmation() {
-        $this->specify('send email', function() {
-            /** @var Account $account */
-            $account = Account::findOne($this->accounts['account-with-change-email-init-state']['id']);
-            /** @var NewEmailForm $model */
-            $key = $this->emailActivations['currentChangeEmailConfirmation']['key'];
-            $model = new NewEmailForm($account, [
-                'key' => $key,
-                'email' => 'my-new-email@ely.by',
-            ]);
-            expect($model->sendNewEmailConfirmation())->true();
-            expect(EmailActivation::findOne($key))->null();
-            expect(EmailActivation::findOne([
-                'account_id' => $account->id,
-                'type' => EmailActivation::TYPE_NEW_EMAIL_CONFIRMATION,
-            ]))->notNull();
-            expect_file($this->getMessageFile())->exists();
-        });
-    }
-
-    private function getMessageFile() {
-        /** @var \yii\swiftmailer\Mailer $mailer */
-        $mailer = Yii::$app->mailer;
-        return Yii::getAlias($mailer->fileTransportPath) . '/testing_message.eml';
+        /** @var Account $account */
+        $account = $this->tester->grabFixture('accounts', 'account-with-change-email-init-state');
+        /** @var NewEmailForm $model */
+        $key = $this->tester->grabFixture('emailActivations', 'currentChangeEmailConfirmation')['key'];
+        $model = new NewEmailForm($account, [
+            'key' => $key,
+            'email' => 'my-new-email@ely.by',
+        ]);
+        $this->assertTrue($model->sendNewEmailConfirmation());
+        $this->assertNull(EmailActivation::findOne($key));
+        $this->assertNotNull(EmailActivation::findOne([
+            'account_id' => $account->id,
+            'type' => EmailActivation::TYPE_NEW_EMAIL_CONFIRMATION,
+        ]));
+        $this->tester->canSeeEmailIsSent();
     }
 
 }

tests/codeception/api/unit/models/profile/ChangeLanguageFormTest.php

@@ -2,35 +2,25 @@
 namespace codeception\api\unit\models\profile;
 
 use api\models\profile\ChangeLanguageForm;
-use Codeception\Specify;
 use common\models\Account;
-use tests\codeception\api\unit\DbTestCase;
+use tests\codeception\api\unit\TestCase;
 use tests\codeception\common\fixtures\AccountFixture;
 
-/**
- * @property AccountFixture $accounts
- */
-class ChangeLanguageFormTest extends DbTestCase {
-    use Specify;
+class ChangeLanguageFormTest extends TestCase {
 
-    public function fixtures() {
+    public function _fixtures() {
         return [
-            'accounts' => [
-                'class' => AccountFixture::class,
-                'dataFile' => '@tests/codeception/common/fixtures/data/accounts.php',
-            ],
+            'accounts' => AccountFixture::class
         ];
     }
 
     public function testApplyLanguage() {
-        $this->specify('language changed', function() {
-            /** @var Account $account */
-            $account = Account::findOne($this->accounts['admin']);
-            $model = new ChangeLanguageForm($account);
-            $model->lang = 'ru';
-            expect($model->applyLanguage())->true();
-            expect($account->lang)->equals('ru');
-        });
+        /** @var Account $account */
+        $account = $this->tester->grabFixture('accounts', 'admin');
+        $model = new ChangeLanguageForm($account);
+        $model->lang = 'ru';
+        $this->assertTrue($model->applyLanguage());
+        $this->assertEquals('ru', $account->lang);
     }
 
 }

tests/codeception/api/unit/models/profile/ChangePasswordFormTest.php

@@ -7,19 +7,15 @@ use api\models\profile\ChangePasswordForm;
 use Codeception\Specify;
 use common\models\Account;
 use common\models\AccountSession;
-use tests\codeception\api\unit\DbTestCase;
+use tests\codeception\api\unit\TestCase;
 use tests\codeception\common\fixtures\AccountFixture;
 use tests\codeception\common\fixtures\AccountSessionFixture;
 use Yii;
 
-/**
- * @property AccountFixture $accounts
- * @property AccountSessionFixture $accountSessions
- */
-class ChangePasswordFormTest extends DbTestCase {
+class ChangePasswordFormTest extends TestCase {
     use Specify;
 
-    public function fixtures() {
+    public function _fixtures() {
         return [
             'accounts' => AccountFixture::class,
             'accountSessions' => AccountSessionFixture::class,
@@ -68,7 +64,7 @@ class ChangePasswordFormTest extends DbTestCase {
     public function testChangePassword() {
         $this->specify('successfully change password with modern hash strategy', function() {
             /** @var Account $account */
-            $account = Account::findOne($this->accounts['admin']['id']);
+            $account = Account::findOne($this->tester->grabFixture('accounts', 'admin')['id']);
             $model = new ChangePasswordForm($account, [
                 'password' => 'password_0',
                 'newPassword' => 'my-new-password',
@@ -83,7 +79,7 @@ class ChangePasswordFormTest extends DbTestCase {
 
         $this->specify('successfully change password with legacy hash strategy', function() {
             /** @var Account $account */
-            $account = Account::findOne($this->accounts['user-with-old-password-type']['id']);
+            $account = Account::findOne($this->tester->grabFixture('accounts', 'user-with-old-password-type')['id']);
             $model = new ChangePasswordForm($account, [
                 'password' => '12345678',
                 'newPassword' => 'my-new-password',
@@ -111,7 +107,7 @@ class ChangePasswordFormTest extends DbTestCase {
             ->getMock();
 
         /** @var AccountSession $session */
-        $session = AccountSession::findOne($this->accountSessions['admin2']['id']);
+        $session = AccountSession::findOne($this->tester->grabFixture('accountSessions', 'admin2')['id']);
 
         $component
             ->expects($this->any())
@@ -122,7 +118,7 @@ class ChangePasswordFormTest extends DbTestCase {
 
         $this->specify('change password with removing all session, except current', function() use ($session) {
             /** @var Account $account */
-            $account = Account::findOne($this->accounts['admin']['id']);
+            $account = Account::findOne($this->tester->grabFixture('accounts', 'admin')['id']);
 
             $model = new ChangePasswordForm($account, [
                 'password' => 'password_0',

tests/codeception/api/unit/models/profile/ChangeUsernameFormTest.php

@@ -6,18 +6,15 @@ use api\models\profile\ChangeUsernameForm;
 use Codeception\Specify;
 use common\models\Account;
 use common\models\UsernameHistory;
-use tests\codeception\api\unit\DbTestCase;
+use tests\codeception\api\unit\TestCase;
 use tests\codeception\common\fixtures\AccountFixture;
 use tests\codeception\common\fixtures\UsernameHistoryFixture;
 use Yii;
 
-/**
- * @property AccountFixture $accounts
- */
-class ChangeUsernameFormTest extends DbTestCase {
+class ChangeUsernameFormTest extends TestCase {
     use Specify;
 
-    public function fixtures() {
+    public function _fixtures() {
         return [
             'accounts' => AccountFixture::class,
             'history' => UsernameHistoryFixture::class,
@@ -31,44 +28,43 @@ class ChangeUsernameFormTest extends DbTestCase {
     }
 
     public function testChange() {
-        $this->specify('successfully change username to new one', function() {
-            $model = new ChangeUsernameForm([
-                'password' => 'password_0',
-                'username' => 'my_new_nickname',
-            ]);
-            expect($model->change())->true();
-            expect(Account::findOne($this->getAccountId())->username)->equals('my_new_nickname');
-            expect(UsernameHistory::findOne(['username' => 'my_new_nickname']))->isInstanceOf(UsernameHistory::class);
-        });
+        $model = new ChangeUsernameForm([
+            'password' => 'password_0',
+            'username' => 'my_new_nickname',
+        ]);
+        $this->assertTrue($model->change());
+        $this->assertEquals('my_new_nickname', Account::findOne($this->getAccountId())->username);
+        $this->assertInstanceOf(UsernameHistory::class, UsernameHistory::findOne(['username' => 'my_new_nickname']));
     }
 
     public function testChangeWithoutChange() {
-        $this->specify('no new UsernameHistory record, if we don\'t change nickname', function() {
-            $model = new ChangeUsernameForm([
-                'password' => 'password_0',
-                'username' => $this->accounts['admin']['username'],
-            ]);
-            $callTime = time();
-            expect($model->change())->true();
-            expect(UsernameHistory::findOne([
-                'AND',
-                'username' => $this->accounts['admin']['username'],
-                ['>=', 'applied_in', $callTime],
-            ]))->null();
-        });
+        $username = $this->tester->grabFixture('accounts', 'admin')['username'];
+        $model = new ChangeUsernameForm([
+            'password' => 'password_0',
+            'username' => $username,
+        ]);
+        $callTime = time();
+        $this->assertTrue($model->change());
+        $this->assertNull(UsernameHistory::findOne([
+            'AND',
+            'username' => $username,
+            ['>=', 'applied_in', $callTime],
+        ]), 'no new UsernameHistory record, if we don\'t change nickname');
     }
 
     public function testChangeCase() {
-        $this->specify('username should change, if we change case of some letters', function() {
-            $newUsername = mb_strtoupper($this->accounts['admin']['username']);
-            $model = new ChangeUsernameForm([
-                'password' => 'password_0',
-                'username' => $newUsername,
-            ]);
-            expect($model->change())->true();
-            expect(Account::findOne($this->getAccountId())->username)->equals($newUsername);
-            expect(UsernameHistory::findOne(['username' => $newUsername]))->isInstanceOf(UsernameHistory::class);
-        });
+        $newUsername = mb_strtoupper($this->tester->grabFixture('accounts', 'admin')['username']);
+        $model = new ChangeUsernameForm([
+            'password' => 'password_0',
+            'username' => $newUsername,
+        ]);
+        $this->assertTrue($model->change());
+        $this->assertEquals($newUsername, Account::findOne($this->getAccountId())->username);
+        $this->assertInstanceOf(
+            UsernameHistory::class,
+            UsernameHistory::findOne(['username' => $newUsername]),
+            'username should change, if we change case of some letters'
+        );
     }
 
     public function testValidateUsername() {
@@ -84,7 +80,7 @@ class ChangeUsernameFormTest extends DbTestCase {
         $this->specify('error.username_not_available is NOT expected if username is already taken by CURRENT user', function() {
             $model = new ChangeUsernameForm([
                 'password' => 'password_0',
-                'username' => $this->accounts['admin']['username'],
+                'username' => $this->tester->grabFixture('accounts', 'admin')['username'],
             ]);
             $model->validateUsername('username');
             expect($model->getErrors('username'))->isEmpty();
@@ -99,7 +95,7 @@ class ChangeUsernameFormTest extends DbTestCase {
     }
 
     private function getAccountId() {
-        return $this->accounts['admin']['id'];
+        return $this->tester->grabFixture('accounts', 'admin')['id'];
     }
 
 }