Upgrade Codeception to 3 version. Remove codeception/verify.

This commit is contained in:
ErickSkrauch
2019-05-14 01:58:29 +03:00
parent 5dacd66fb7
commit 75fdd5d1ba
35 changed files with 737 additions and 291 deletions

View File

@@ -19,7 +19,7 @@ class FeedbackFormTest extends TestCase {
}
public function testSendMessageWithEmail() {
/** @var FeedbackForm|\PHPUnit_Framework_MockObject_MockObject $model */
/** @var FeedbackForm|\PHPUnit\Framework\MockObject\MockObject $model */
$model = $this->getMockBuilder(FeedbackForm::class)
->setMethods(['getAccount'])
->setConstructorArgs([[

View File

@@ -1,11 +1,9 @@
<?php
namespace codeception\api\unit\models;
use api\components\User\IdentityInterface;
use api\components\User\Jwt;
use api\components\User\JwtIdentity;
use api\tests\unit\TestCase;
use Codeception\Specify;
use common\tests\_support\ProtectedCaller;
use common\tests\fixtures\AccountFixture;
use Emarref\Jwt\Claim;
@@ -14,7 +12,6 @@ use Emarref\Jwt\Token;
use Yii;
class JwtIdentityTest extends TestCase {
use Specify;
use ProtectedCaller;
public function _fixtures(): array {
@@ -26,7 +23,6 @@ class JwtIdentityTest extends TestCase {
public function testFindIdentityByAccessToken() {
$token = $this->generateToken();
$identity = JwtIdentity::findIdentityByAccessToken($token);
$this->assertInstanceOf(IdentityInterface::class, $identity);
$this->assertSame($token, $identity->getId());
$this->assertSame($this->tester->grabFixture('accounts', 'admin')['id'], $identity->getAccount()->id);
}

View File

@@ -11,7 +11,7 @@ use common\tests\fixtures\EmailActivationFixture;
class ConfirmEmailFormTest extends TestCase {
public function _fixtures() {
public function _fixtures(): array {
return [
'emailActivations' => EmailActivationFixture::class,
];

View File

@@ -4,7 +4,6 @@ namespace codeception\api\unit\models\authentication;
use api\components\ReCaptcha\Validator as ReCaptchaValidator;
use api\models\authentication\ForgotPasswordForm;
use api\tests\unit\TestCase;
use Codeception\Specify;
use common\models\Account;
use common\models\EmailActivation;
use common\tasks\SendPasswordRecoveryEmail;
@@ -14,7 +13,6 @@ use GuzzleHttp\ClientInterface;
use Yii;
class ForgotPasswordFormTest extends TestCase {
use Specify;
protected function setUp() {
parent::setUp();
@@ -25,7 +23,7 @@ class ForgotPasswordFormTest extends TestCase {
});
}
public function _fixtures() {
public function _fixtures(): array {
return [
'accounts' => AccountFixture::class,
'emailActivations' => EmailActivationFixture::class,
@@ -104,12 +102,13 @@ class ForgotPasswordFormTest extends TestCase {
}
/**
* @param SendPasswordRecoveryEmail $job
* @param \yii\queue\JobInterface $job
* @param Account $account
* @param EmailActivation $activation
*/
private function assertTaskCreated($job, Account $account, EmailActivation $activation) {
$this->assertInstanceOf(SendPasswordRecoveryEmail::class, $job);
/** @var SendPasswordRecoveryEmail $job */
$this->assertSame($account->username, $job->username);
$this->assertSame($account->email, $job->email);
$this->assertSame($account->lang, $job->locale);

View File

@@ -25,7 +25,7 @@ class LoginFormTest extends TestCase {
$_SERVER['REMOTE_ADDR'] = $this->originalRemoteAddr;
}
public function _fixtures() {
public function _fixtures(): array {
return [
'accounts' => AccountFixture::class,
];

View File

@@ -27,7 +27,7 @@ class LogoutFormTest extends TestCase {
Yii::$app->set('user', $userComp);
$model = new LogoutForm();
expect($model->logout())->true();
$this->assertTrue($model->logout());
});
$this->specify('if active session is presented, then delete should be called', function() {

View File

@@ -4,15 +4,13 @@ namespace api\tests\_support\models\authentication;
use api\components\User\AuthenticationResult;
use api\models\authentication\RecoverPasswordForm;
use api\tests\unit\TestCase;
use Codeception\Specify;
use common\models\Account;
use common\models\EmailActivation;
use common\tests\fixtures\EmailActivationFixture;
class RecoverPasswordFormTest extends TestCase {
use Specify;
public function _fixtures() {
public function _fixtures(): array {
return [
'emailActivations' => EmailActivationFixture::class,
];

View File

@@ -11,7 +11,7 @@ use common\tests\fixtures\AccountSessionFixture;
class RefreshTokenFormTest extends TestCase {
use Specify;
public function _fixtures() {
public function _fixtures(): array {
return [
'sessions' => AccountSessionFixture::class,
];

View File

@@ -30,7 +30,7 @@ class RegistrationFormTest extends TestCase {
});
}
public function _fixtures() {
public function _fixtures(): array {
return [
'accounts' => AccountFixture::class,
'emailActivations' => EmailActivationFixture::class,

View File

@@ -24,7 +24,7 @@ class RepeatAccountActivationFormTest extends TestCase {
});
}
public function _fixtures() {
public function _fixtures(): array {
return [
'accounts' => AccountFixture::class,
'activations' => EmailActivationFixture::class,
@@ -35,21 +35,21 @@ class RepeatAccountActivationFormTest extends TestCase {
$this->specify('error.email_not_found if passed valid email, but it don\'t exists in database', function() {
$model = new RepeatAccountActivationForm(['email' => 'me-is-not@exists.net']);
$model->validateEmailForAccount('email');
expect($model->getErrors('email'))->equals(['error.email_not_found']);
$this->assertSame(['error.email_not_found'], $model->getErrors('email'));
});
$this->specify('error.account_already_activated if passed valid email, but account already activated', function() {
$fixture = $this->tester->grabFixture('accounts', 'admin');
$model = new RepeatAccountActivationForm(['email' => $fixture['email']]);
$model->validateEmailForAccount('email');
expect($model->getErrors('email'))->equals(['error.account_already_activated']);
$this->assertSame(['error.account_already_activated'], $model->getErrors('email'));
});
$this->specify('no errors if passed valid email for not activated account', function() {
$fixture = $this->tester->grabFixture('accounts', 'not-activated-account');
$model = new RepeatAccountActivationForm(['email' => $fixture['email']]);
$model->validateEmailForAccount('email');
expect($model->getErrors('email'))->isEmpty();
$this->assertEmpty($model->getErrors('email'));
});
}
@@ -58,14 +58,14 @@ class RepeatAccountActivationFormTest extends TestCase {
$fixture = $this->tester->grabFixture('activations', 'freshRegistrationConfirmation');
$model = $this->createModel(['emailKey' => $fixture['key']]);
$model->validateExistsActivation('email');
expect($model->getErrors('email'))->equals(['error.recently_sent_message']);
$this->assertSame(['error.recently_sent_message'], $model->getErrors('email'));
});
$this->specify('no errors if passed email has expired activation message', function() {
$fixture = $this->tester->grabFixture('activations', 'oldRegistrationConfirmation');
$model = $this->createModel(['emailKey' => $fixture['key']]);
$model->validateExistsActivation('email');
expect($model->getErrors('email'))->isEmpty();
$this->assertEmpty($model->getErrors('email'));
});
}