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

php cs fixer

Browse Source
This commit is contained in:
Antonio Ramirez
2016-12-15 23:01:45 +01:00
parent 3ba01b4674
commit b0cf145c6b
27 changed files with 68 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/_app/config/console.php
View File

@ -4,12 +4,12 @@ return [
'id' => 'yii2-test-console', 'id' => 'yii2-test-console',
'basePath' => dirname(__DIR__), 'basePath' => dirname(__DIR__),
'aliases' => [ 'aliases' => [
'@Da/User' => dirname(dirname(dirname(__DIR__))) . '/lib/User', '@Da/User' => dirname(dirname(dirname(__DIR__))).'/lib/User',
'@tests' => dirname(dirname(__DIR__)), '@tests' => dirname(dirname(__DIR__)),
], ],
'components' => [ 'components' => [
'log' => null, 'log' => null,
'cache' => null, 'cache' => null,
'db' => require __DIR__ . '/db.php', 'db' => require __DIR__.'/db.php',
], ],
]; ];

4
tests/_app/config/db.php
View File

@ -8,8 +8,8 @@ $db = [
'charset' => 'utf8', 'charset' => 'utf8',
]; ];
if (file_exists(__DIR__ . '/db.local.php')) { if (file_exists(__DIR__.'/db.local.php')) {
$db = array_merge($db, require(__DIR__ . '/db.local.php')); $db = array_merge($db, require(__DIR__.'/db.local.php'));
} }
return $db; return $db;

8
tests/_app/config/test.php
View File

@ -5,10 +5,10 @@ return [
'basePath' => dirname(__DIR__), 'basePath' => dirname(__DIR__),
'language' => 'en-US', 'language' => 'en-US',
'aliases' => [ 'aliases' => [
'@Da/User' => dirname(dirname(dirname(__DIR__))) . '/lib/User', '@Da/User' => dirname(dirname(dirname(__DIR__))).'/lib/User',
'@tests' => dirname(dirname(__DIR__)), '@tests' => dirname(dirname(__DIR__)),
'@vendor' => VENDOR_DIR, '@vendor' => VENDOR_DIR,
'@bower' => VENDOR_DIR . '/bower-asset', '@bower' => VENDOR_DIR.'/bower-asset',
], ],
'bootstrap' => ['Da\User\Bootstrap'], 'bootstrap' => ['Da\User\Bootstrap'],
'modules' => [ 'modules' => [
@ -19,9 +19,9 @@ return [
], ],
'components' => [ 'components' => [
'assetManager' => [ 'assetManager' => [
'basePath' => __DIR__ . '/../assets' 'basePath' => __DIR__.'/../assets',
], ],
'db' => require __DIR__ . '/db.php', 'db' => require __DIR__.'/db.php',
'mailer' => [ 'mailer' => [
'useFileTransport' => true, 'useFileTransport' => true,
], ],

4
tests/_app/yii.php
View File

@ -1,12 +1,12 @@
#!/usr/bin/env php #!/usr/bin/env php
<?php <?php
require dirname(__DIR__) . '/_bootstrap.php'; require dirname(__DIR__).'/_bootstrap.php';
defined('STDIN') or define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w')); defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
$config = require(__DIR__ . '/config/console.php'); $config = require __DIR__.'/config/console.php';
$exitCode = (new yii\console\Application($config))->run(); $exitCode = (new yii\console\Application($config))->run();
exit($exitCode); exit($exitCode);

10
tests/_bootstrap.php
View File

@ -4,17 +4,17 @@ define('YII_ENV', 'test');
defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
// Search for autoload, since performance is irrelevant and usability isn't! // Search for autoload, since performance is irrelevant and usability isn't!
$dir = __DIR__ . '/../'; $dir = __DIR__.'/../';
while (!file_exists($dir . '/vendor/autoload.php')) { while (!file_exists($dir.'/vendor/autoload.php')) {
if ($dir == dirname($dir)) { if ($dir == dirname($dir)) {
throw new \Exception('Failed to locate autoload.php'); throw new \Exception('Failed to locate autoload.php');
} }
$dir = dirname($dir); $dir = dirname($dir);
} }
$vendor = $dir . '/vendor'; $vendor = $dir.'/vendor';
define('VENDOR_DIR', $vendor); define('VENDOR_DIR', $vendor);
require_once $vendor . '/autoload.php'; require_once $vendor.'/autoload.php';
require $vendor . '/yiisoft/yii2/Yii.php'; require $vendor.'/yiisoft/yii2/Yii.php';

2
tests/_fixtures/ProfileFixture.php
View File

@ -9,6 +9,6 @@ class ProfileFixture extends ActiveFixture
public $modelClass = 'Da\User\Model\Profile'; public $modelClass = 'Da\User\Model\Profile';
public $depends = [ public $depends = [
'tests\_fixtures\UserFixture' 'tests\_fixtures\UserFixture',
]; ];
} }

2
tests/_fixtures/TokenFixture.php
View File

@ -9,6 +9,6 @@ class TokenFixture extends ActiveFixture
public $modelClass = 'Da\User\Model\Token'; public $modelClass = 'Da\User\Model\Token';
public $depends = [ public $depends = [
'tests\_fixtures\UserFixture' 'tests\_fixtures\UserFixture',
]; ];
} }

2
tests/_fixtures/data/profile.php
View File

@ -5,6 +5,6 @@ $time = time();
return [ return [
'user' => [ 'user' => [
'user_id' => 1, 'user_id' => 1,
'name' => 'John Doe', 'name' => 'John Doe',
], ],
]; ];

24
tests/_fixtures/data/token.php
View File

@ -6,27 +6,27 @@ $time = time();
return [ return [
'confirmation' => [ 'confirmation' => [
'user_id' => 2, 'user_id' => 2,
'code' => 'NO2aCmBIjFQX624xmAc3VBu7Th3NJoa6', 'code' => 'NO2aCmBIjFQX624xmAc3VBu7Th3NJoa6',
'type' => Token::TYPE_CONFIRMATION, 'type' => Token::TYPE_CONFIRMATION,
'created_at' => $time, 'created_at' => $time,
], ],
'expired_confirmation' => [ 'expired_confirmation' => [
'user_id' => 3, 'user_id' => 3,
'code' => 'qxYa315rqRgCOjYGk82GFHMEAV3T82AX', 'code' => 'qxYa315rqRgCOjYGk82GFHMEAV3T82AX',
'type' => Token::TYPE_CONFIRMATION, 'type' => Token::TYPE_CONFIRMATION,
'created_at' => $time - 86401, 'created_at' => $time - 86401,
], ],
'expired_recovery' => [ 'expired_recovery' => [
'user_id' => 5, 'user_id' => 5,
'code' => 'a5839d0e73b9c525942c2f59e88c1aaf', 'code' => 'a5839d0e73b9c525942c2f59e88c1aaf',
'type' => Token::TYPE_RECOVERY, 'type' => Token::TYPE_RECOVERY,
'created_at' => $time - 21601, 'created_at' => $time - 21601,
], ],
'recovery' => [ 'recovery' => [
'user_id' => 6, 'user_id' => 6,
'code' => '6f5d0dad53ef73e6ba6f01a441c0e602', 'code' => '6f5d0dad53ef73e6ba6f01a441c0e602',
'type' => Token::TYPE_RECOVERY, 'type' => Token::TYPE_RECOVERY,
'created_at' => $time, 'created_at' => $time,
], ],
]; ];

2
tests/_pages/AdminPage.php
View File

@ -11,6 +11,6 @@ use yii\codeception\BasePage;
*/ */
class AdminPage extends BasePage class AdminPage extends BasePage
{ {
/** @inheritdoc */ /** {@inheritdoc} */
public $route = '/user/admin/index'; public $route = '/user/admin/index';
} }

2
tests/_pages/CreatePage.php
View File

@ -11,7 +11,7 @@ use yii\codeception\BasePage;
*/ */
class CreatePage extends BasePage class CreatePage extends BasePage
{ {
/** @inheritdoc */ /** {@inheritdoc} */
public $route = '/user/admin/create'; public $route = '/user/admin/create';
/** /**

2
tests/_pages/LoginPage.php
View File

@ -11,7 +11,7 @@ use yii\codeception\BasePage;
*/ */
class LoginPage extends BasePage class LoginPage extends BasePage
{ {
/** @inheritdoc */ /** {@inheritdoc} */
public $route = '/user/security/login'; public $route = '/user/security/login';
/** /**

2
tests/_pages/RecoveryPage.php
View File

@ -11,7 +11,7 @@ use yii\codeception\BasePage;
*/ */
class RecoveryPage extends BasePage class RecoveryPage extends BasePage
{ {
/** @inheritdoc */ /** {@inheritdoc} */
public $route = '/user/recovery/request'; public $route = '/user/recovery/request';
/** /**

2
tests/_pages/RegistrationPage.php
View File

@ -11,7 +11,7 @@ use yii\codeception\BasePage;
*/ */
class RegistrationPage extends BasePage class RegistrationPage extends BasePage
{ {
/** @inheritdoc */ /** {@inheritdoc} */
public $route = '/user/registration/register'; public $route = '/user/registration/register';
/** /**

2
tests/_pages/ResendPage.php
View File

@ -11,7 +11,7 @@ use yii\codeception\BasePage;
*/ */
class ResendPage extends BasePage class ResendPage extends BasePage
{ {
/** @inheritdoc */ /** {@inheritdoc} */
public $route = '/user/registration/resend'; public $route = '/user/registration/resend';
/** /**

2
tests/_pages/SettingsPage.php
View File

@ -11,7 +11,7 @@ use yii\codeception\BasePage;
*/ */
class SettingsPage extends BasePage class SettingsPage extends BasePage
{ {
/** @inheritdoc */ /** {@inheritdoc} */
public $route = '/user/settings/account'; public $route = '/user/settings/account';
/** /**

2
tests/_pages/UpdatePage.php
View File

@ -11,7 +11,7 @@ use yii\codeception\BasePage;
*/ */
class UpdatePage extends BasePage class UpdatePage extends BasePage
{ {
/** @inheritdoc */ /** {@inheritdoc} */
public $route = '/user/admin/update'; public $route = '/user/admin/update';
/** /**

7
tests/_support/FunctionalTester.php
View File

@ -2,7 +2,8 @@
/** /**
* Inherited Methods * Inherited Methods.
*
* @method void wantToTest($text) * @method void wantToTest($text)
* @method void wantTo($text) * @method void wantTo($text)
* @method void execute($callable) * @method void execute($callable)
@ -15,12 +16,12 @@
* @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL) * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
* *
* @SuppressWarnings(PHPMD) * @SuppressWarnings(PHPMD)
*/ */
class FunctionalTester extends \Codeception\Actor class FunctionalTester extends \Codeception\Actor
{ {
use _generated\FunctionalTesterActions; use _generated\FunctionalTesterActions;
/** /*
* Define custom actions here * Define custom actions here
*/ */
} }

7
tests/_support/UnitTester.php
View File

@ -2,7 +2,8 @@
/** /**
* Inherited Methods * Inherited Methods.
*
* @method void wantToTest($text) * @method void wantToTest($text)
* @method void wantTo($text) * @method void wantTo($text)
* @method void execute($callable) * @method void execute($callable)
@ -15,12 +16,12 @@
* @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL) * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
* *
* @SuppressWarnings(PHPMD) * @SuppressWarnings(PHPMD)
*/ */
class UnitTester extends \Codeception\Actor class UnitTester extends \Codeception\Actor
{ {
use _generated\UnitTesterActions; use _generated\UnitTesterActions;
/** /*
* Define custom actions here * Define custom actions here
*/ */
} }

3
tests/functional/ConfirmationCept.php
View File

@ -1,9 +1,8 @@
<?php <?php
/** /**
* @var Codeception\Scenario $scenario * @var Codeception\Scenario
*/ */
use tests\_fixtures\TokenFixture; use tests\_fixtures\TokenFixture;
use yii\helpers\Url; use yii\helpers\Url;

3
tests/functional/CreateCept.php
View File

@ -1,9 +1,8 @@
<?php <?php
/** /**
* @var Codeception\Scenario $scenario * @var Codeception\Scenario
*/ */
use tests\_fixtures\UserFixture; use tests\_fixtures\UserFixture;
use tests\_pages\CreatePage; use tests\_pages\CreatePage;
use tests\_pages\LoginPage; use tests\_pages\LoginPage;

3
tests/functional/LoginCept.php
View File

@ -1,9 +1,8 @@
<?php <?php
/** /**
* @var Codeception\Scenario $scenario * @var Codeception\Scenario
*/ */
use tests\_fixtures\UserFixture; use tests\_fixtures\UserFixture;
use tests\_pages\LoginPage; use tests\_pages\LoginPage;

7
tests/functional/RecoveryCept.php
View File

@ -1,9 +1,8 @@
<?php <?php
/** /**
* @var Codeception\Scenario $scenario * @var Codeception\Scenario
*/ */
use tests\_fixtures\TokenFixture; use tests\_fixtures\TokenFixture;
use tests\_fixtures\UserFixture; use tests\_fixtures\UserFixture;
use tests\_pages\RecoveryPage; use tests\_pages\RecoveryPage;
@ -40,7 +39,7 @@ $message = $I->grabLastSentEmail();
//$token = $I->grabRecord(Token::className(), ['user_id' => $user->id, 'type' => Token::TYPE_RECOVERY]); //$token = $I->grabRecord(Token::className(), ['user_id' => $user->id, 'type' => Token::TYPE_RECOVERY]);
//$I->amOnPage(Url::toRoute(['/user/recovery/reset', 'id' => $user->id, 'code' => $token->code])); //$I->amOnPage(Url::toRoute(['/user/recovery/reset', 'id' => $user->id, 'code' => $token->code]));
//$I->see('Recovery link is invalid or expired. Please try requesting a new one.'); //$I->see('Recovery link is invalid or expired. Please try requesting a new one.');
//
//$I->amGoingTo('reset password'); //$I->amGoingTo('reset password');
//$user = $I->grabFixture('user', 'user_with_recovery_token'); //$user = $I->grabFixture('user', 'user_with_recovery_token');
//$token = $I->grabRecord(Token::className(), ['user_id' => $user->id, 'type' => Token::TYPE_RECOVERY]); //$token = $I->grabRecord(Token::className(), ['user_id' => $user->id, 'type' => Token::TYPE_RECOVERY]);
@ -48,7 +47,7 @@ $message = $I->grabLastSentEmail();
//$I->fillField('#recoveryform-password', 'newpass'); //$I->fillField('#recoveryform-password', 'newpass');
//$I->click('Finish'); //$I->click('Finish');
//$I->see('Your password has been changed successfully.'); //$I->see('Your password has been changed successfully.');
//
//$page = LoginPage::openBy($I); //$page = LoginPage::openBy($I);
//$page->login($user->email, 'qwerty'); //$page->login($user->email, 'qwerty');
//$I->see('Invalid login or password'); //$I->see('Invalid login or password');

11
tests/functional/RegistrationCest.php
View File

@ -19,19 +19,20 @@ class RegistrationCest
public function _after(FunctionalTester $I) public function _after(FunctionalTester $I)
{ {
\Yii::$container->set(Module::className(), [ \Yii::$container->set(Module::className(), [
'enableEmailConfirmation' => true, 'enableEmailConfirmation' => true,
'generatePasswords' => false, 'generatePasswords' => false,
]); ]);
} }
/** /**
* Tests registration with email, username and password without any confirmation. * Tests registration with email, username and password without any confirmation.
*
* @param FunctionalTester $I * @param FunctionalTester $I
*/ */
public function testRegistration(FunctionalTester $I) public function testRegistration(FunctionalTester $I)
{ {
\Yii::$container->set(Module::className(), [ \Yii::$container->set(Module::className(), [
'enableEmailConfirmation' => false, 'enableEmailConfirmation' => false,
'generatePasswords' => false, 'generatePasswords' => false,
]); ]);
@ -62,6 +63,7 @@ class RegistrationCest
/** /**
* Tests registration when confirmation message is sent. * Tests registration when confirmation message is sent.
*
* @param FunctionalTester $I * @param FunctionalTester $I
*/ */
public function testRegistrationWithConfirmation(FunctionalTester $I) public function testRegistrationWithConfirmation(FunctionalTester $I)
@ -72,7 +74,7 @@ class RegistrationCest
$page = RegistrationPage::openBy($I); $page = RegistrationPage::openBy($I);
$page->register('tester@example.com', 'tester', 'tester'); $page->register('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 and a message with further instructions has been sent to your email');
$user = $I->grabRecord(User::className(), ['email' => 'tester@example.com']); $user = $I->grabRecord(User::className(), ['email' => 'tester@example.com']);
$token = $I->grabRecord(Token::className(), ['user_id' => $user->id, 'type' => Token::TYPE_CONFIRMATION]); $token = $I->grabRecord(Token::className(), ['user_id' => $user->id, 'type' => Token::TYPE_CONFIRMATION]);
/** @var yii\swiftmailer\Message $message */ /** @var yii\swiftmailer\Message $message */
$message = $I->grabLastSentEmail(); $message = $I->grabLastSentEmail();
@ -83,12 +85,13 @@ class RegistrationCest
/** /**
* Tests registration when password is generated automatically and sent to user. * Tests registration when password is generated automatically and sent to user.
*
* @param FunctionalTester $I * @param FunctionalTester $I
*/ */
public function testRegistrationWithoutPassword(FunctionalTester $I) public function testRegistrationWithoutPassword(FunctionalTester $I)
{ {
\Yii::$container->set(Module::className(), [ \Yii::$container->set(Module::className(), [
'enableEmailConfirmation' => false, 'enableEmailConfirmation' => false,
'generatePasswords' => true, 'generatePasswords' => true,
]); ]);
$page = RegistrationPage::openBy($I); $page = RegistrationPage::openBy($I);

3
tests/functional/ResendCept.php
View File

@ -1,9 +1,8 @@
<?php <?php
/** /**
* @var Codeception\Scenario $scenario * @var Codeception\Scenario
*/ */
use tests\_fixtures\UserFixture; use tests\_fixtures\UserFixture;
use tests\_pages\ResendPage; use tests\_pages\ResendPage;

11
tests/functional/SettingsCept.php
View File

@ -1,9 +1,8 @@
<?php <?php
/** /**
* @var Codeception\Scenario $scenario * @var Codeception\Scenario
*/ */
use Da\User\Model\Token; use Da\User\Model\Token;
use Da\User\Model\User; use Da\User\Model\User;
use tests\_fixtures\ProfileFixture; use tests\_fixtures\ProfileFixture;
@ -30,7 +29,7 @@ $I->amGoingTo('check that email is changing properly');
$page->update('new_user@example.com', $user->username, 'qwerty'); $page->update('new_user@example.com', $user->username, 'qwerty');
$I->seeRecord(User::className(), ['email' => $user->email, 'unconfirmed_email' => 'new_user@example.com']); $I->seeRecord(User::className(), ['email' => $user->email, 'unconfirmed_email' => 'new_user@example.com']);
$I->see('A confirmation message has been sent to your new email address'); $I->see('A confirmation message has been sent to your new email address');
$user = $I->grabRecord(User::className(), ['id' => $user->id]); $user = $I->grabRecord(User::className(), ['id' => $user->id]);
$token = $I->grabRecord(Token::className(), ['user_id' => $user->id, 'type' => Token::TYPE_CONFIRM_NEW_EMAIL]); $token = $I->grabRecord(Token::className(), ['user_id' => $user->id, 'type' => Token::TYPE_CONFIRM_NEW_EMAIL]);
/** @var yii\swiftmailer\Message $message */ /** @var yii\swiftmailer\Message $message */
$message = $I->grabLastSentEmail(); $message = $I->grabLastSentEmail();
@ -62,14 +61,14 @@ $page = SettingsPage::openBy($I);
$page->update('user@example.com', $user->username, 'qwerty'); $page->update('user@example.com', $user->username, 'qwerty');
$I->see('A confirmation message has been sent to your new email address'); $I->see('A confirmation message has been sent to your new email address');
$I->seeRecord(User::className(), [ $I->seeRecord(User::className(), [
'id' => 1, 'id' => 1,
'email' => 'new_user@example.com', 'email' => 'new_user@example.com',
'unconfirmed_email' => 'user@example.com', 'unconfirmed_email' => 'user@example.com',
]); ]);
$page->update('new_user@example.com', $user->username, 'qwerty'); $page->update('new_user@example.com', $user->username, 'qwerty');
$I->see('Your account details have been updated'); $I->see('Your account details have been updated');
$I->seeRecord(User::className(), [ $I->seeRecord(User::className(), [
'id' => 1, 'id' => 1,
'email' => 'new_user@example.com', 'email' => 'new_user@example.com',
'unconfirmed_email' => null, 'unconfirmed_email' => null,
]); ]);
@ -78,7 +77,7 @@ $page->update('new_user@example.com', 'nickname', 'qwerty', '123654');
$I->see('Your account details have been updated'); $I->see('Your account details have been updated');
$I->seeRecord(User::className(), [ $I->seeRecord(User::className(), [
'username' => 'nickname', 'username' => 'nickname',
'email' => 'new_user@example.com', 'email' => 'new_user@example.com',
]); ]);
Yii::$app->user->logout(); Yii::$app->user->logout();

3
tests/functional/UpdateCept.php
View File

@ -1,9 +1,8 @@
<?php <?php
/** /**
* @var Codeception\Scenario $scenario * @var Codeception\Scenario
*/ */
use tests\_fixtures\UserFixture; use tests\_fixtures\UserFixture;
use tests\_pages\UpdatePage; use tests\_pages\UpdatePage;
use tests\_pages\LoginPage; use tests\_pages\LoginPage;