leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge with upstream

Browse Source
This commit is contained in:
E.Alamo
2018-05-27 07:09:02 +02:00
parent 1d0168379a 71f9587374
commit 83d6f9547e
121 changed files with 2598 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/_data/schema.sql
View File

@ -76,6 +76,8 @@ CREATE TABLE `user` (
`gdpr_consent` tinyint(1) NULL DEFAULT '0',
`gdpr_consent_date` int(11) NULL,
`gdpr_deleted` tinyint(1) DEFAULT '0',
`last_login_ip` varchar(45) DEFAULT NULL,
`password_changed_at` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `user_unique_email` (`email`),

4
tests/functional/RegistrationCest.php
View File

@ -50,7 +50,7 @@ class RegistrationCest
$I->see(Html::encode('This email address has already been taken'));
$this->register($I, 'tester@example.com', 'tester', 'tester');
$I->see('Your account has been created and a message with further instructions has been sent to your email');
$I->see('Your account has been created');
$user = $I->grabRecord(User::className(), ['email' => 'tester@example.com']);
$I->assertTrue($user->isConfirmed);
@ -96,7 +96,7 @@ class RegistrationCest
]);
$I->amOnRoute('/user/registration/register');
$this->register($I, 'tester@example.com', 'tester');
$I->see('Your account has been created and a message with further instructions has been sent to your email');
$I->see('Your account has been created');
$user = $I->grabRecord(User::className(), ['email' => 'tester@example.com']);
$I->assertEquals('tester', $user->username);
/** @var yii\swiftmailer\Message $message */