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

Fix tests with PHPUnit 9

Browse Source
This commit is contained in:
Lorenzo Milesi
2020-03-15 08:04:34 +01:00
parent a3a330ecff
commit badba36796
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -47,9 +47,9 @@ before_script:
- php tests/_app/yii.php migrate/up --interactive=0 - php tests/_app/yii.php migrate/up --interactive=0
- php tests/_app/yii.php migrate/up --interactive=0 --migrationPath=@yii/rbac/migrations - php tests/_app/yii.php migrate/up --interactive=0 --migrationPath=@yii/rbac/migrations
# enable code coverage on PHP 7.1, only one PHP version needs to generate coverage data # enable code coverage on PHP 7.2, only one PHP version needs to generate coverage data
- | - |
if [ $TRAVIS_PHP_VERSION = '7.1' ]; then if [ $TRAVIS_PHP_VERSION = '7.2' ]; then
CODECEPTION_FLAGS="--coverage-xml" CODECEPTION_FLAGS="--coverage-xml"
fi fi
@ -59,7 +59,7 @@ script:
after_script: after_script:
- | - |
if [ $TRAVIS_PHP_VERSION = '7.1' ]; then if [ $TRAVIS_PHP_VERSION = '7.2' ]; then
travis_retry wget https://scrutinizer-ci.com/ocular.phar travis_retry wget https://scrutinizer-ci.com/ocular.phar
php ocular.phar code-coverage:upload --format=php-clover tests/_output/coverage.xml php ocular.phar code-coverage:upload --format=php-clover tests/_output/coverage.xml
fi fi

4
tests/functional/GdprCest.php
View File

@ -102,7 +102,7 @@ class GdprCest
/** @var yii\swiftmailer\Message $message */ /** @var yii\swiftmailer\Message $message */
$message = $I->grabLastSentEmail(); $message = $I->grabLastSentEmail();
$I->assertArrayHasKey($user->email, $message->getTo()); $I->assertArrayHasKey($user->email, $message->getTo());
$I->assertContains(Html::encode($token->getUrl()), utf8_encode(quoted_printable_decode($message->getSwiftMessage()->toString()))); $I->assertStringContainsString(Html::encode($token->getUrl()), utf8_encode(quoted_printable_decode($message->getSwiftMessage()->toString())));
$I->assertFalse($user->isConfirmed); $I->assertFalse($user->isConfirmed);
} }
@ -123,7 +123,7 @@ class GdprCest
/** @var yii\swiftmailer\Message $message */ /** @var yii\swiftmailer\Message $message */
$message = $I->grabLastSentEmail(); $message = $I->grabLastSentEmail();
$I->assertArrayHasKey($user->email, $message->getTo()); $I->assertArrayHasKey($user->email, $message->getTo());
$I->assertContains('We have generated a password for you', utf8_encode(quoted_printable_decode($message->getSwiftMessage()->toString()))); $I->assertStringContainsString('We have generated a password for you', utf8_encode(quoted_printable_decode($message->getSwiftMessage()->toString())));
} }

2
tests/functional/RecoveryCept.php
View File

@ -41,7 +41,7 @@ $token = $I->grabRecord(Token::className(), ['user_id' => $user->id, 'type' => T
/** @var yii\swiftmailer\Message $message */ /** @var yii\swiftmailer\Message $message */
$message = $I->grabLastSentEmail(); $message = $I->grabLastSentEmail();
$I->assertArrayHasKey($user->email, $message->getTo()); $I->assertArrayHasKey($user->email, $message->getTo());
$I->assertContains( $I->assertStringContainsString(
Html::encode($token->getUrl()), Html::encode($token->getUrl()),
utf8_encode(quoted_printable_decode($message->getSwiftMessage()->toString())) utf8_encode(quoted_printable_decode($message->getSwiftMessage()->toString()))
); );

4
tests/functional/RegistrationCest.php
View File

@ -73,7 +73,7 @@ class RegistrationCest
/** @var yii\swiftmailer\Message $message */ /** @var yii\swiftmailer\Message $message */
$message = $I->grabLastSentEmail(); $message = $I->grabLastSentEmail();
$I->assertArrayHasKey($user->email, $message->getTo()); $I->assertArrayHasKey($user->email, $message->getTo());
$I->assertContains(Html::encode($token->getUrl()), utf8_encode(quoted_printable_decode($message->getSwiftMessage()->toString()))); $I->assertStringContainsString(Html::encode($token->getUrl()), utf8_encode(quoted_printable_decode($message->getSwiftMessage()->toString())));
$I->assertFalse($user->isConfirmed); $I->assertFalse($user->isConfirmed);
} }
@ -94,7 +94,7 @@ class RegistrationCest
/** @var yii\swiftmailer\Message $message */ /** @var yii\swiftmailer\Message $message */
$message = $I->grabLastSentEmail(); $message = $I->grabLastSentEmail();
$I->assertArrayHasKey($user->email, $message->getTo()); $I->assertArrayHasKey($user->email, $message->getTo());
$I->assertContains('We have generated a password for you', utf8_encode(quoted_printable_decode($message->getSwiftMessage()->toString()))); $I->assertStringContainsString('We have generated a password for you', utf8_encode(quoted_printable_decode($message->getSwiftMessage()->toString())));
} }
protected function register(FunctionalTester $I, $email, $username = null, $password = null) { protected function register(FunctionalTester $I, $email, $username = null, $password = null) {

2
tests/functional/SettingsCept.php
View File

@ -39,7 +39,7 @@ $token = $I->grabRecord(Token::className(), ['user_id' => $user->id, 'type' => T
/** @var yii\swiftmailer\Message $message */ /** @var yii\swiftmailer\Message $message */
$message = $I->grabLastSentEmail(); $message = $I->grabLastSentEmail();
$I->assertArrayHasKey($user->unconfirmed_email, $message->getTo()); $I->assertArrayHasKey($user->unconfirmed_email, $message->getTo());
$I->assertContains(Html::encode($token->getUrl()), utf8_encode(quoted_printable_decode($message->getSwiftMessage()->toString()))); $I->assertStringContainsString(Html::encode($token->getUrl()), utf8_encode(quoted_printable_decode($message->getSwiftMessage()->toString())));
Yii::$app->user->logout(); Yii::$app->user->logout();
$I->amGoingTo('log in using new email address before clicking the confirmation link'); $I->amGoingTo('log in using new email address before clicking the confirmation link');