From 9c4c8ffbcc5c1e87dee31bb33c339c2c54407621 Mon Sep 17 00:00:00 2001 From: AlexGx Date: Tue, 4 Mar 2014 23:04:20 +0200 Subject: [PATCH] apps code style fixes --- apps/advanced/common/tests/_helpers/FixtureHelper.php | 3 +-- apps/advanced/common/tests/_pages/LoginPage.php | 1 - apps/advanced/common/tests/unit/models/LoginFormTest.php | 7 +++---- apps/advanced/frontend/tests/_pages/SignupPage.php | 1 - apps/advanced/frontend/tests/acceptance/SignupCest.php | 1 - apps/advanced/frontend/tests/functional/SignupCest.php | 1 - apps/advanced/frontend/tests/unit/models/ContactFormTest.php | 3 +-- .../frontend/tests/unit/models/PasswordResetRequestFormTest.php | 9 ++++----- .../frontend/tests/unit/models/ResetPasswordFormTest.php | 9 ++++----- apps/advanced/frontend/tests/unit/models/SignupFormTest.php | 5 ++--- 10 files changed, 15 insertions(+), 25 deletions(-) diff --git a/apps/advanced/common/tests/_helpers/FixtureHelper.php b/apps/advanced/common/tests/_helpers/FixtureHelper.php index 00c3a17..507b60c 100644 --- a/apps/advanced/common/tests/_helpers/FixtureHelper.php +++ b/apps/advanced/common/tests/_helpers/FixtureHelper.php @@ -32,7 +32,7 @@ class FixtureHelper extends Module * to use in acceptance and functional tests. * @param array $settings */ - public function _beforeSuite($settings = array()) + public function _beforeSuite($settings = []) { $this->loadFixtures(); } @@ -54,5 +54,4 @@ class FixtureHelper extends Module ], ]; } - } diff --git a/apps/advanced/common/tests/_pages/LoginPage.php b/apps/advanced/common/tests/_pages/LoginPage.php index af95ea3..5fdf3bc 100644 --- a/apps/advanced/common/tests/_pages/LoginPage.php +++ b/apps/advanced/common/tests/_pages/LoginPage.php @@ -18,5 +18,4 @@ class LoginPage extends BasePage $this->guy->fillField('input[name="LoginForm[password]"]', $password); $this->guy->click('login-button'); } - } diff --git a/apps/advanced/common/tests/unit/models/LoginFormTest.php b/apps/advanced/common/tests/unit/models/LoginFormTest.php index 2ececd6..9ca277d 100644 --- a/apps/advanced/common/tests/unit/models/LoginFormTest.php +++ b/apps/advanced/common/tests/unit/models/LoginFormTest.php @@ -25,7 +25,7 @@ class LoginFormTest extends TestCase $model->username = 'some_username'; $model->password = 'some_password'; - $this->specify('user should not be able to login, when there is no identity' , function () use ($model) { + $this->specify('user should not be able to login, when there is no identity', function () use ($model) { expect('model should not login user', $model->login())->false(); expect('user should not be logged in', Yii::$app->user->isGuest)->true(); }); @@ -52,7 +52,7 @@ class LoginFormTest extends TestCase $model->username = 'demo'; $model->password = 'demo'; - $this->specify('user should be able to login with correct credentials', function() use ($model) { + $this->specify('user should be able to login with correct credentials', function () use ($model) { expect('model should login user', $model->login())->true(); expect('error message should not be set', $model->errors)->hasntKey('password'); expect('user should be logged in', Yii::$app->user->isGuest)->false(); @@ -61,9 +61,8 @@ class LoginFormTest extends TestCase private function mockUser($user) { - $loginForm = $this->getMock('common\models\LoginForm',['getUser']); + $loginForm = $this->getMock('common\models\LoginForm', ['getUser']); $loginForm->expects($this->any())->method('getUser')->will($this->returnValue($user)); return $loginForm; } - } diff --git a/apps/advanced/frontend/tests/_pages/SignupPage.php b/apps/advanced/frontend/tests/_pages/SignupPage.php index ba4a9cb..0281ac9 100644 --- a/apps/advanced/frontend/tests/_pages/SignupPage.php +++ b/apps/advanced/frontend/tests/_pages/SignupPage.php @@ -20,5 +20,4 @@ class SignupPage extends BasePage } $this->guy->click('signup-button'); } - } diff --git a/apps/advanced/frontend/tests/acceptance/SignupCest.php b/apps/advanced/frontend/tests/acceptance/SignupCest.php index a166f34..268ff6b 100644 --- a/apps/advanced/frontend/tests/acceptance/SignupCest.php +++ b/apps/advanced/frontend/tests/acceptance/SignupCest.php @@ -79,5 +79,4 @@ class SignupCest $I->expectTo('see that user logged in'); $I->see('Logout (tester)'); } - } diff --git a/apps/advanced/frontend/tests/functional/SignupCest.php b/apps/advanced/frontend/tests/functional/SignupCest.php index cfef787..0409d23 100644 --- a/apps/advanced/frontend/tests/functional/SignupCest.php +++ b/apps/advanced/frontend/tests/functional/SignupCest.php @@ -79,5 +79,4 @@ class SignupCest $I->expectTo('see that user logged in'); $I->see('Logout (tester)'); } - } diff --git a/apps/advanced/frontend/tests/unit/models/ContactFormTest.php b/apps/advanced/frontend/tests/unit/models/ContactFormTest.php index 23e6288..a754672 100644 --- a/apps/advanced/frontend/tests/unit/models/ContactFormTest.php +++ b/apps/advanced/frontend/tests/unit/models/ContactFormTest.php @@ -42,7 +42,7 @@ class ContactFormTest extends TestCase expect('email file should exist', file_exists($this->getMessageFile()))->true(); }); - $this->specify('message should contain correct data', function () use($model) { + $this->specify('message should contain correct data', function () use ($model) { $emailMessage = file_get_contents($this->getMessageFile()); expect('email should contain user name', $emailMessage)->contains($model->name); @@ -56,5 +56,4 @@ class ContactFormTest extends TestCase { return Yii::getAlias(Yii::$app->mail->fileTransportPath) . '/testing_message.eml'; } - } diff --git a/apps/advanced/frontend/tests/unit/models/PasswordResetRequestFormTest.php b/apps/advanced/frontend/tests/unit/models/PasswordResetRequestFormTest.php index b736039..7591ff3 100644 --- a/apps/advanced/frontend/tests/unit/models/PasswordResetRequestFormTest.php +++ b/apps/advanced/frontend/tests/unit/models/PasswordResetRequestFormTest.php @@ -28,14 +28,14 @@ class PasswordResetRequestFormTest extends DbTestCase public function testSendEmailWrongUser() { - $this->specify('no user with such email, message should not be send', function() { + $this->specify('no user with such email, message should not be send', function () { $model = new PasswordResetRequestForm(); $model->email = 'not-existing-email@example.com'; expect('email not send', $model->sendEmail())->false(); }); - $this->specify('user is not active, message should not be send', function() { + $this->specify('user is not active, message should not be send', function () { $model = new PasswordResetRequestForm(); $model->email = $this->user[1]['email']; @@ -52,8 +52,8 @@ class PasswordResetRequestFormTest extends DbTestCase expect('email sent', $model->sendEmail())->true(); expect('user has valid token', $user->password_reset_token)->notNull(); - $this->specify('message has correct format', function() use ($model) { - expect('message file exists', file_exists($this->getMessageFile()))->true(); + $this->specify('message has correct format', function () use ($model) { + expect('message file exists', file_exists($this->getMessageFile()))->true(); $message = file_get_contents($this->getMessageFile()); expect('message "from" is correct', $message)->contains(Yii::$app->params['supportEmail']); @@ -75,5 +75,4 @@ class PasswordResetRequestFormTest extends DbTestCase { return Yii::getAlias(Yii::$app->mail->fileTransportPath) . '/testing_message.eml'; } - } diff --git a/apps/advanced/frontend/tests/unit/models/ResetPasswordFormTest.php b/apps/advanced/frontend/tests/unit/models/ResetPasswordFormTest.php index 763683f..b00c2ac 100644 --- a/apps/advanced/frontend/tests/unit/models/ResetPasswordFormTest.php +++ b/apps/advanced/frontend/tests/unit/models/ResetPasswordFormTest.php @@ -13,13 +13,13 @@ class ResetPasswordFormTest extends DbTestCase public function testResetPassword() { - $this->specify('wrong reset token', function() { - $this->setExpectedException('\Exception','Wrong password reset token.'); + $this->specify('wrong reset token', function () { + $this->setExpectedException('\Exception', 'Wrong password reset token.'); new ResetPasswordForm('notexistingtoken_1391882543'); }); - $this->specify('not correct token', function() { - $this->setExpectedException('yii\base\InvalidParamException','Password reset token cannot be blank.'); + $this->specify('not correct token', function () { + $this->setExpectedException('yii\base\InvalidParamException', 'Password reset token cannot be blank.'); new ResetPasswordForm(''); }); } @@ -33,5 +33,4 @@ class ResetPasswordFormTest extends DbTestCase ], ]; } - } diff --git a/apps/advanced/frontend/tests/unit/models/SignupFormTest.php b/apps/advanced/frontend/tests/unit/models/SignupFormTest.php index 5176baa..359a02c 100644 --- a/apps/advanced/frontend/tests/unit/models/SignupFormTest.php +++ b/apps/advanced/frontend/tests/unit/models/SignupFormTest.php @@ -12,7 +12,7 @@ class SignupFormTest extends DbTestCase public function testCorrectSignup() { - $model = $this->getMock('frontend\models\SignupForm',['validate']); + $model = $this->getMock('frontend\models\SignupForm', ['validate']); $model->expects($this->once())->method('validate')->will($this->returnValue(true)); $model->username = 'some_username'; @@ -28,7 +28,7 @@ class SignupFormTest extends DbTestCase public function testNotCorrectSignup() { - $model = $this->getMock('frontend\models\SignupForm',['validate']); + $model = $this->getMock('frontend\models\SignupForm', ['validate']); $model->expects($this->once())->method('validate')->will($this->returnValue(false)); expect('user should not be created', $model->signup())->null(); @@ -43,5 +43,4 @@ class SignupFormTest extends DbTestCase ], ]; } - }