Отрефакторены тесты для форм

This commit is contained in:
ErickSkrauch
2016-03-20 23:33:09 +03:00
parent ddb5fd813c
commit b277f48785
6 changed files with 137 additions and 124 deletions

View File

@@ -23,57 +23,29 @@ class ChangePasswordFormTest extends DbTestCase {
];
}
public function testChangePasswordErrors() {
/** @var Account $account */
$account = Account::findOne($this->accounts['admin']['id']);
$model = new ChangePasswordForm($account);
$this->specify('expected error.{field}_required if we don\'t pass some fields', function() use ($model, $account) {
expect('form should return false', $model->changePassword())->false();
expect('form should contain errors', $model->getErrors())->equals([
'password' => ['error.password_required'],
'newPassword' => ['error.newPassword_required'],
'newRePassword' => ['error.newRePassword_required'],
public function testValidatePasswordAndRePasswordMatch() {
$this->specify('error.newRePassword_does_not_match expected if passwords not match', function() {
$account = new Account();
$account->setPassword('12345678');
$model = new ChangePasswordForm($account, [
'password' => '12345678',
'newPassword' => 'my-new-password',
'newRePassword' => 'another-password',
]);
expect('password not changed', $account->validatePassword('password_0'))->true();
$model->validatePasswordAndRePasswordMatch('newRePassword');
expect($model->getErrors('newRePassword'))->equals(['error.newRePassword_does_not_match']);
});
$model = new ChangePasswordForm($account, [
'password' => 'this-is-wrong-password',
'newPassword' => 'my-new-password',
'newRePassword' => 'my-new-password',
]);
$this->specify('expected error.password_incorrect if we pass invalid current account password', function() use ($model, $account) {
expect('form should return false', $model->changePassword())->false();
expect('form should contain errors', $model->getErrors())->equals([
'password' => ['error.password_incorrect'],
$this->specify('no errors expected if passwords are valid', function() {
$account = new Account();
$account->setPassword('12345678');
$model = new ChangePasswordForm($account, [
'password' => '12345678',
'newPassword' => 'my-new-password',
'newRePassword' => 'my-new-password',
]);
expect('password not changed', $account->validatePassword('password_0'))->true();
});
$model = new ChangePasswordForm($account, [
'password' => 'password_0',
'newPassword' => 'short',
'newRePassword' => 'short',
]);
$this->specify('expected error.password_too_short if we pass short password', function() use ($model, $account) {
expect('form should return false', $model->changePassword())->false();
expect('form should contain errors', $model->getErrors())->equals([
'newPassword' => ['error.password_too_short'],
]);
expect('password not changed', $account->validatePassword('password_0'))->true();
});
$model = new ChangePasswordForm($account, [
'password' => 'password_0',
'newPassword' => 'first-valid-pass',
'newRePassword' => 'another-valid-pass',
]);
$this->specify('expected error.newRePassword_does_not_match if we passwords mismatch', function() use ($model, $account) {
expect('form should return false', $model->changePassword())->false();
expect('form should contain errors', $model->getErrors())->equals([
'newRePassword' => ['error.newRePassword_does_not_match'],
]);
expect('password not changed', $account->validatePassword('password_0'))->true();
$model->validatePasswordAndRePasswordMatch('newRePassword');
expect($model->getErrors('newRePassword'))->isEmpty();
});
}
@@ -88,7 +60,6 @@ class ChangePasswordFormTest extends DbTestCase {
$this->specify('successfully change password with modern hash strategy', function() use ($model, $account) {
expect('form should return true', $model->changePassword())->true();
expect('new password should be successfully stored into account', $account->validatePassword('my-new-password'))->true();
expect('always use new strategy', $account->password_hash_strategy)->equals(Account::PASS_HASH_STRATEGY_YII2);
});
/** @var Account $account */
@@ -101,7 +72,6 @@ class ChangePasswordFormTest extends DbTestCase {
$this->specify('successfully change password with legacy hash strategy', function() use ($model, $account) {
expect('form should return true', $model->changePassword())->true();
expect('new password should be successfully stored into account', $account->validatePassword('my-new-password'))->true();
expect('strategy should be changed to modern', $account->password_hash_strategy)->equals(Account::PASS_HASH_STRATEGY_YII2);
});
}