Переработана структура тестов для формы аутентификации

This commit is contained in:
ErickSkrauch
2016-01-03 20:37:55 +03:00
parent 7b650e2654
commit c6a6f35be6
2 changed files with 88 additions and 107 deletions

View File

@ -17,23 +17,17 @@ class AuthenticationForm extends Model {
return [
['email', 'required', 'message' => 'error.email_required'],
['email', 'email', 'message' => 'error.email_invalid'],
['email', 'validateEmail'],
['email', 'exist', 'targetClass' => Account::class, 'skipOnError' => true, 'message' => 'error.email_not_exist'],
['password', 'required', 'message' => 'error.password_required'],
['password', 'required', 'when' => function(self $model) {
return !$model->hasErrors();
}, 'message' => 'error.password_required'],
['password', 'validatePassword'],
['rememberMe', 'boolean'],
];
}
public function validateEmail($attribute) {
if (!$this->hasErrors()) {
if ($this->getAccount() === NULL) {
$this->addError($attribute, 'error.email_not_exist');
}
}
}
public function validatePassword($attribute) {
if (!$this->hasErrors()) {
$account = $this->getAccount();