From cef430af01b0bc49ffdc2fd4c3ddb899a4e72a62 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Sat, 16 Aug 2014 18:15:41 +0400 Subject: [PATCH] Renamed guy classes to actors, fixed phpdoc and code style --- .../tests/codeception/backend/.gitignore | 6 ++--- .../codeception/backend/acceptance.suite.yml | 2 +- .../backend/acceptance/LoginCept.php | 4 ++-- .../codeception/backend/functional.suite.yml | 2 +- .../backend/functional/LoginCept.php | 4 ++-- .../tests/codeception/backend/unit.suite.yml | 2 +- .../tests/codeception/common/.gitignore | 6 ++--- .../codeception/common/_pages/LoginPage.php | 10 +++++--- .../common/_support/FixtureHelper.php | 4 ++-- .../common/fixtures/UserFixture.php | 3 +++ .../tests/codeception/common/unit.suite.yml | 2 +- .../codeception/common/unit/DbTestCase.php | 3 +++ .../codeception/common/unit/TestCase.php | 3 +++ .../common/unit/models/LoginFormTest.php | 6 +++++ .../tests/codeception/console/.gitignore | 2 +- .../tests/codeception/console/unit.suite.yml | 2 +- .../codeception/console/unit/DbTestCase.php | 3 +++ .../codeception/console/unit/TestCase.php | 3 +++ .../tests/codeception/frontend/.gitignore | 6 ++--- .../codeception/frontend/_pages/AboutPage.php | 4 ++++ .../frontend/_pages/ContactPage.php | 8 +++++-- .../frontend/_pages/SignupPage.php | 8 +++++-- .../codeception/frontend/acceptance.suite.yml | 2 +- .../frontend/acceptance/AboutCept.php | 4 ++-- .../frontend/acceptance/ContactCept.php | 24 +++++++++---------- .../frontend/acceptance/HomeCept.php | 4 ++-- .../frontend/acceptance/LoginCept.php | 4 ++-- .../frontend/acceptance/SignupCest.php | 20 ++++++++-------- .../codeception/frontend/functional.suite.yml | 2 +- .../frontend/functional/AboutCept.php | 4 ++-- .../frontend/functional/ContactCept.php | 24 +++++++++---------- .../frontend/functional/HomeCept.php | 4 ++-- .../frontend/functional/LoginCept.php | 4 ++-- .../frontend/functional/SignupCest.php | 24 +++++++++---------- .../tests/codeception/frontend/unit.suite.yml | 2 +- .../codeception/frontend/unit/DbTestCase.php | 3 +++ .../codeception/frontend/unit/TestCase.php | 3 +++ apps/basic/tests/codeception/.gitignore | 6 ++--- .../tests/codeception/_pages/AboutPage.php | 4 ++++ .../tests/codeception/_pages/ContactPage.php | 8 +++++-- .../tests/codeception/_pages/LoginPage.php | 10 +++++--- .../tests/codeception/acceptance.suite.yml | 2 +- .../codeception/acceptance/AboutCept.php | 2 +- .../codeception/acceptance/ContactCept.php | 2 +- .../tests/codeception/acceptance/HomeCept.php | 2 +- .../codeception/acceptance/LoginCept.php | 2 +- .../tests/codeception/functional.suite.yml | 2 +- .../codeception/functional/AboutCept.php | 2 +- .../codeception/functional/ContactCept.php | 2 +- .../tests/codeception/functional/HomeCept.php | 2 +- .../codeception/functional/LoginCept.php | 2 +- apps/basic/tests/codeception/unit.suite.yml | 2 +- extensions/codeception/BasePage.php | 10 ++++---- extensions/codeception/DbTestCase.php | 2 ++ extensions/codeception/README.md | 4 ++-- 55 files changed, 172 insertions(+), 115 deletions(-) diff --git a/apps/advanced/tests/codeception/backend/.gitignore b/apps/advanced/tests/codeception/backend/.gitignore index c5aa0743de..985dbb4239 100644 --- a/apps/advanced/tests/codeception/backend/.gitignore +++ b/apps/advanced/tests/codeception/backend/.gitignore @@ -1,4 +1,4 @@ # these files are auto generated by codeception build -/unit/CodeGuy.php -/functional/TestGuy.php -/acceptance/WebGuy.php +/unit/UnitTester.php +/functional/FunctionalTester.php +/acceptance/AcceptanceTester.php diff --git a/apps/advanced/tests/codeception/backend/acceptance.suite.yml b/apps/advanced/tests/codeception/backend/acceptance.suite.yml index d2b4eea26d..0157530a2e 100644 --- a/apps/advanced/tests/codeception/backend/acceptance.suite.yml +++ b/apps/advanced/tests/codeception/backend/acceptance.suite.yml @@ -8,7 +8,7 @@ # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES. -class_name: WebGuy +class_name: AcceptanceTester modules: enabled: - PhpBrowser diff --git a/apps/advanced/tests/codeception/backend/acceptance/LoginCept.php b/apps/advanced/tests/codeception/backend/acceptance/LoginCept.php index 96438db21d..e86b3f3713 100644 --- a/apps/advanced/tests/codeception/backend/acceptance/LoginCept.php +++ b/apps/advanced/tests/codeception/backend/acceptance/LoginCept.php @@ -1,9 +1,9 @@ wantTo('ensure login page works'); $loginPage = LoginPage::openBy($I); diff --git a/apps/advanced/tests/codeception/backend/functional.suite.yml b/apps/advanced/tests/codeception/backend/functional.suite.yml index 18e0252149..b04e7c8b9c 100644 --- a/apps/advanced/tests/codeception/backend/functional.suite.yml +++ b/apps/advanced/tests/codeception/backend/functional.suite.yml @@ -6,7 +6,7 @@ # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES. #basic/web/index.php -class_name: TestGuy +class_name: FunctionalTester modules: enabled: - Filesystem diff --git a/apps/advanced/tests/codeception/backend/functional/LoginCept.php b/apps/advanced/tests/codeception/backend/functional/LoginCept.php index fdccdb3f94..4322258d88 100644 --- a/apps/advanced/tests/codeception/backend/functional/LoginCept.php +++ b/apps/advanced/tests/codeception/backend/functional/LoginCept.php @@ -1,9 +1,9 @@ wantTo('ensure login page works'); $loginPage = LoginPage::openBy($I); diff --git a/apps/advanced/tests/codeception/backend/unit.suite.yml b/apps/advanced/tests/codeception/backend/unit.suite.yml index f0573a843a..a0582a5363 100644 --- a/apps/advanced/tests/codeception/backend/unit.suite.yml +++ b/apps/advanced/tests/codeception/backend/unit.suite.yml @@ -3,4 +3,4 @@ # suite for unit (internal) tests. # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES. -class_name: CodeGuy +class_name: UnitTester diff --git a/apps/advanced/tests/codeception/common/.gitignore b/apps/advanced/tests/codeception/common/.gitignore index c5aa0743de..985dbb4239 100644 --- a/apps/advanced/tests/codeception/common/.gitignore +++ b/apps/advanced/tests/codeception/common/.gitignore @@ -1,4 +1,4 @@ # these files are auto generated by codeception build -/unit/CodeGuy.php -/functional/TestGuy.php -/acceptance/WebGuy.php +/unit/UnitTester.php +/functional/FunctionalTester.php +/acceptance/AcceptanceTester.php diff --git a/apps/advanced/tests/codeception/common/_pages/LoginPage.php b/apps/advanced/tests/codeception/common/_pages/LoginPage.php index 1293e0ea90..7f93ed0633 100644 --- a/apps/advanced/tests/codeception/common/_pages/LoginPage.php +++ b/apps/advanced/tests/codeception/common/_pages/LoginPage.php @@ -4,6 +4,10 @@ namespace codeception\common\_pages; use yii\codeception\BasePage; +/** + * Represents loging page + * @property \codeception_frontend\AcceptanceTester|\codeception_frontend\FunctionalTester|\codeception_backend\AcceptanceTester|\codeception_backend\FunctionalTester $actor + */ class LoginPage extends BasePage { public $route = 'site/login'; @@ -14,8 +18,8 @@ class LoginPage extends BasePage */ public function login($username, $password) { - $this->guy->fillField('input[name="LoginForm[username]"]', $username); - $this->guy->fillField('input[name="LoginForm[password]"]', $password); - $this->guy->click('login-button'); + $this->actor->fillField('input[name="LoginForm[username]"]', $username); + $this->actor->fillField('input[name="LoginForm[password]"]', $password); + $this->actor->click('login-button'); } } diff --git a/apps/advanced/tests/codeception/common/_support/FixtureHelper.php b/apps/advanced/tests/codeception/common/_support/FixtureHelper.php index a7624a0bab..22c485759c 100644 --- a/apps/advanced/tests/codeception/common/_support/FixtureHelper.php +++ b/apps/advanced/tests/codeception/common/_support/FixtureHelper.php @@ -16,7 +16,7 @@ class FixtureHelper extends Module /** * Redeclare visibility because codeception includes all public methods that not starts from "_" - * and not excluded by module settings, in guy class. + * and not excluded by module settings, in actor class. */ use FixtureTrait { loadFixtures as protected; @@ -52,7 +52,7 @@ class FixtureHelper extends Module { return [ 'user' => [ - 'class' => UserFixture::className(), + 'class' => UserFixture::className(), 'dataFile' => '@codeception/common/fixtures/data/init_login.php', ], ]; diff --git a/apps/advanced/tests/codeception/common/fixtures/UserFixture.php b/apps/advanced/tests/codeception/common/fixtures/UserFixture.php index b5f28ca450..db5e0d19a5 100644 --- a/apps/advanced/tests/codeception/common/fixtures/UserFixture.php +++ b/apps/advanced/tests/codeception/common/fixtures/UserFixture.php @@ -4,6 +4,9 @@ namespace codeception\common\fixtures; use yii\test\ActiveFixture; +/** + * User fixture + */ class UserFixture extends ActiveFixture { public $modelClass = 'common\models\User'; diff --git a/apps/advanced/tests/codeception/common/unit.suite.yml b/apps/advanced/tests/codeception/common/unit.suite.yml index f0573a843a..a0582a5363 100644 --- a/apps/advanced/tests/codeception/common/unit.suite.yml +++ b/apps/advanced/tests/codeception/common/unit.suite.yml @@ -3,4 +3,4 @@ # suite for unit (internal) tests. # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES. -class_name: CodeGuy +class_name: UnitTester diff --git a/apps/advanced/tests/codeception/common/unit/DbTestCase.php b/apps/advanced/tests/codeception/common/unit/DbTestCase.php index 427ebae0ae..1a510d2df8 100644 --- a/apps/advanced/tests/codeception/common/unit/DbTestCase.php +++ b/apps/advanced/tests/codeception/common/unit/DbTestCase.php @@ -2,6 +2,9 @@ namespace codeception\common\unit; +/** + * @inheritdoc + */ class DbTestCase extends \yii\codeception\DbTestCase { public $appConfig = '@codeception/common/unit/_config.php'; diff --git a/apps/advanced/tests/codeception/common/unit/TestCase.php b/apps/advanced/tests/codeception/common/unit/TestCase.php index e7919367d7..6d85860ce8 100644 --- a/apps/advanced/tests/codeception/common/unit/TestCase.php +++ b/apps/advanced/tests/codeception/common/unit/TestCase.php @@ -2,6 +2,9 @@ namespace common\tests\unit; +/** + * @inheritdoc + */ class TestCase extends \yii\codeception\TestCase { public $appConfig = '@common/tests/unit/_config.php'; diff --git a/apps/advanced/tests/codeception/common/unit/models/LoginFormTest.php b/apps/advanced/tests/codeception/common/unit/models/LoginFormTest.php index 2f786e067b..847b8df95f 100644 --- a/apps/advanced/tests/codeception/common/unit/models/LoginFormTest.php +++ b/apps/advanced/tests/codeception/common/unit/models/LoginFormTest.php @@ -8,6 +8,9 @@ use Codeception\Specify; use common\models\LoginForm; use codeception\common\fixtures\UserFixture; +/** + * Login form test + */ class LoginFormTest extends DbTestCase { @@ -75,6 +78,9 @@ class LoginFormTest extends DbTestCase }); } + /** + * @inheritdoc + */ public function fixtures() { return [ diff --git a/apps/advanced/tests/codeception/console/.gitignore b/apps/advanced/tests/codeception/console/.gitignore index 65a0d8a2a4..f235304500 100644 --- a/apps/advanced/tests/codeception/console/.gitignore +++ b/apps/advanced/tests/codeception/console/.gitignore @@ -1,2 +1,2 @@ # these files are auto generated by codeception build -/unit/CodeGuy.php +/unit/UnitTester.php diff --git a/apps/advanced/tests/codeception/console/unit.suite.yml b/apps/advanced/tests/codeception/console/unit.suite.yml index f0573a843a..a0582a5363 100644 --- a/apps/advanced/tests/codeception/console/unit.suite.yml +++ b/apps/advanced/tests/codeception/console/unit.suite.yml @@ -3,4 +3,4 @@ # suite for unit (internal) tests. # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES. -class_name: CodeGuy +class_name: UnitTester diff --git a/apps/advanced/tests/codeception/console/unit/DbTestCase.php b/apps/advanced/tests/codeception/console/unit/DbTestCase.php index cdc542aa9a..28c90a6f75 100644 --- a/apps/advanced/tests/codeception/console/unit/DbTestCase.php +++ b/apps/advanced/tests/codeception/console/unit/DbTestCase.php @@ -2,6 +2,9 @@ namespace console\tests\unit; +/** + * @inheritdoc + */ class DbTestCase extends \yii\codeception\DbTestCase { public $appConfig = '@console/tests/unit/_config.php'; diff --git a/apps/advanced/tests/codeception/console/unit/TestCase.php b/apps/advanced/tests/codeception/console/unit/TestCase.php index 08b0039e53..7af86c36de 100644 --- a/apps/advanced/tests/codeception/console/unit/TestCase.php +++ b/apps/advanced/tests/codeception/console/unit/TestCase.php @@ -2,6 +2,9 @@ namespace console\tests\unit; +/** + * @inheritdoc + */ class TestCase extends \yii\codeception\TestCase { public $appConfig = '@console/tests/unit/_config.php'; diff --git a/apps/advanced/tests/codeception/frontend/.gitignore b/apps/advanced/tests/codeception/frontend/.gitignore index c5aa0743de..985dbb4239 100644 --- a/apps/advanced/tests/codeception/frontend/.gitignore +++ b/apps/advanced/tests/codeception/frontend/.gitignore @@ -1,4 +1,4 @@ # these files are auto generated by codeception build -/unit/CodeGuy.php -/functional/TestGuy.php -/acceptance/WebGuy.php +/unit/UnitTester.php +/functional/FunctionalTester.php +/acceptance/AcceptanceTester.php diff --git a/apps/advanced/tests/codeception/frontend/_pages/AboutPage.php b/apps/advanced/tests/codeception/frontend/_pages/AboutPage.php index eaf605abcd..d752edc0c9 100644 --- a/apps/advanced/tests/codeception/frontend/_pages/AboutPage.php +++ b/apps/advanced/tests/codeception/frontend/_pages/AboutPage.php @@ -4,6 +4,10 @@ namespace codeception\frontend\_pages; use yii\codeception\BasePage; +/** + * Represents about page + * @property \codeception_frontend\AcceptanceTester|\codeception_frontend\FunctionalTester $actor + */ class AboutPage extends BasePage { public $route = 'site/about'; diff --git a/apps/advanced/tests/codeception/frontend/_pages/ContactPage.php b/apps/advanced/tests/codeception/frontend/_pages/ContactPage.php index a498f34da5..986e371088 100644 --- a/apps/advanced/tests/codeception/frontend/_pages/ContactPage.php +++ b/apps/advanced/tests/codeception/frontend/_pages/ContactPage.php @@ -4,6 +4,10 @@ namespace codeception\frontend\_pages; use yii\codeception\BasePage; +/** + * Represents contact page + * @property \codeception_frontend\AcceptanceTester|\codeception_frontend\FunctionalTester $actor + */ class ContactPage extends BasePage { public $route = 'site/contact'; @@ -15,8 +19,8 @@ class ContactPage extends BasePage { foreach ($contactData as $field => $value) { $inputType = $field === 'body' ? 'textarea' : 'input'; - $this->guy->fillField($inputType . '[name="ContactForm[' . $field . ']"]', $value); + $this->actor->fillField($inputType . '[name="ContactForm[' . $field . ']"]', $value); } - $this->guy->click('contact-button'); + $this->actor->click('contact-button'); } } diff --git a/apps/advanced/tests/codeception/frontend/_pages/SignupPage.php b/apps/advanced/tests/codeception/frontend/_pages/SignupPage.php index 2b129ca968..49bdcf9d43 100644 --- a/apps/advanced/tests/codeception/frontend/_pages/SignupPage.php +++ b/apps/advanced/tests/codeception/frontend/_pages/SignupPage.php @@ -4,6 +4,10 @@ namespace codeception\frontend\_pages; use \yii\codeception\BasePage; +/** + * Represents signup page + * @property \codeception_frontend\AcceptanceTester|\codeception_frontend\FunctionalTester $actor + */ class SignupPage extends BasePage { @@ -16,8 +20,8 @@ class SignupPage extends BasePage { foreach ($signupData as $field => $value) { $inputType = $field === 'body' ? 'textarea' : 'input'; - $this->guy->fillField($inputType . '[name="SignupForm[' . $field . ']"]', $value); + $this->actor->fillField($inputType . '[name="SignupForm[' . $field . ']"]', $value); } - $this->guy->click('signup-button'); + $this->actor->click('signup-button'); } } diff --git a/apps/advanced/tests/codeception/frontend/acceptance.suite.yml b/apps/advanced/tests/codeception/frontend/acceptance.suite.yml index d2b4eea26d..0157530a2e 100644 --- a/apps/advanced/tests/codeception/frontend/acceptance.suite.yml +++ b/apps/advanced/tests/codeception/frontend/acceptance.suite.yml @@ -8,7 +8,7 @@ # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES. -class_name: WebGuy +class_name: AcceptanceTester modules: enabled: - PhpBrowser diff --git a/apps/advanced/tests/codeception/frontend/acceptance/AboutCept.php b/apps/advanced/tests/codeception/frontend/acceptance/AboutCept.php index e416de0736..c52234f1f8 100644 --- a/apps/advanced/tests/codeception/frontend/acceptance/AboutCept.php +++ b/apps/advanced/tests/codeception/frontend/acceptance/AboutCept.php @@ -1,8 +1,8 @@ wantTo('ensure that about works'); AboutPage::openBy($I); $I->see('About', 'h1'); diff --git a/apps/advanced/tests/codeception/frontend/acceptance/ContactCept.php b/apps/advanced/tests/codeception/frontend/acceptance/ContactCept.php index e76771a6f6..c80469ee9c 100644 --- a/apps/advanced/tests/codeception/frontend/acceptance/ContactCept.php +++ b/apps/advanced/tests/codeception/frontend/acceptance/ContactCept.php @@ -1,8 +1,8 @@ wantTo('ensure that contact works'); $contactPage = ContactPage::openBy($I); @@ -21,11 +21,11 @@ $I->see('The verification code is incorrect', '.help-block'); $I->amGoingTo('submit contact form with not correct email'); $contactPage->submit([ - 'name' => 'tester', - 'email' => 'tester.email', - 'subject' => 'test subject', - 'body' => 'test content', - 'verifyCode' => 'testme', + 'name' => 'tester', + 'email' => 'tester.email', + 'subject' => 'test subject', + 'body' => 'test content', + 'verifyCode' => 'testme', ]); $I->expectTo('see that email adress is wrong'); $I->dontSee('Name cannot be blank', '.help-block'); @@ -36,10 +36,10 @@ $I->dontSee('The verification code is incorrect', '.help-block'); $I->amGoingTo('submit contact form with correct data'); $contactPage->submit([ - 'name' => 'tester', - 'email' => 'tester@example.com', - 'subject' => 'test subject', - 'body' => 'test content', - 'verifyCode' => 'testme', + 'name' => 'tester', + 'email' => 'tester@example.com', + 'subject' => 'test subject', + 'body' => 'test content', + 'verifyCode' => 'testme', ]); $I->see('Thank you for contacting us. We will respond to you as soon as possible.'); diff --git a/apps/advanced/tests/codeception/frontend/acceptance/HomeCept.php b/apps/advanced/tests/codeception/frontend/acceptance/HomeCept.php index c9eb9062f9..efbcddbb86 100644 --- a/apps/advanced/tests/codeception/frontend/acceptance/HomeCept.php +++ b/apps/advanced/tests/codeception/frontend/acceptance/HomeCept.php @@ -1,7 +1,7 @@ wantTo('ensure that home page works'); $I->amOnPage(Yii::$app->homeUrl); $I->see('My Company'); diff --git a/apps/advanced/tests/codeception/frontend/acceptance/LoginCept.php b/apps/advanced/tests/codeception/frontend/acceptance/LoginCept.php index ba065ad489..cc8411d8de 100644 --- a/apps/advanced/tests/codeception/frontend/acceptance/LoginCept.php +++ b/apps/advanced/tests/codeception/frontend/acceptance/LoginCept.php @@ -1,8 +1,8 @@ wantTo('ensure login page works'); $loginPage = LoginPage::openBy($I); diff --git a/apps/advanced/tests/codeception/frontend/acceptance/SignupCest.php b/apps/advanced/tests/codeception/frontend/acceptance/SignupCest.php index b12566f6cd..9b86b953ab 100644 --- a/apps/advanced/tests/codeception/frontend/acceptance/SignupCest.php +++ b/apps/advanced/tests/codeception/frontend/acceptance/SignupCest.php @@ -10,7 +10,7 @@ class SignupCest /** * This method is called before each cest class test method - * @param \Codeception\Event\Test $event + * @param \Codeception\Event\TestEvent $event */ public function _before($event) { @@ -18,7 +18,7 @@ class SignupCest /** * This method is called after each cest class test method, even if test failed. - * @param \Codeception\Event\Test $event + * @param \Codeception\Event\TestEvent $event */ public function _after($event) { @@ -30,14 +30,14 @@ class SignupCest /** * This method is called when test fails. - * @param \Codeception\Event\Fail $event + * @param \Codeception\Event\FailEvent $event */ public function _fail($event) { } /** - * @param \WebGuy $I + * @param \codeception_frontend\AcceptanceTester $I * @param \Codeception\Scenario $scenario */ public function testUserSignup($I, $scenario) @@ -59,9 +59,9 @@ class SignupCest $I->amGoingTo('submit signup form with not correct email'); $signupPage->submit([ - 'username' => 'tester', - 'email' => 'tester.email', - 'password' => 'tester_password', + 'username' => 'tester', + 'email' => 'tester.email', + 'password' => 'tester_password', ]); $I->expectTo('see that email address is wrong'); @@ -71,9 +71,9 @@ class SignupCest $I->amGoingTo('submit signup form with correct email'); $signupPage->submit([ - 'username' => 'tester', - 'email' => 'tester.email@example.com', - 'password' => 'tester_password', + 'username' => 'tester', + 'email' => 'tester.email@example.com', + 'password' => 'tester_password', ]); $I->expectTo('see that user logged in'); diff --git a/apps/advanced/tests/codeception/frontend/functional.suite.yml b/apps/advanced/tests/codeception/frontend/functional.suite.yml index 18e0252149..b04e7c8b9c 100644 --- a/apps/advanced/tests/codeception/frontend/functional.suite.yml +++ b/apps/advanced/tests/codeception/frontend/functional.suite.yml @@ -6,7 +6,7 @@ # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES. #basic/web/index.php -class_name: TestGuy +class_name: FunctionalTester modules: enabled: - Filesystem diff --git a/apps/advanced/tests/codeception/frontend/functional/AboutCept.php b/apps/advanced/tests/codeception/frontend/functional/AboutCept.php index f65548ded1..158e4fa0e5 100644 --- a/apps/advanced/tests/codeception/frontend/functional/AboutCept.php +++ b/apps/advanced/tests/codeception/frontend/functional/AboutCept.php @@ -1,8 +1,8 @@ wantTo('ensure that about works'); AboutPage::openBy($I); $I->see('About', 'h1'); diff --git a/apps/advanced/tests/codeception/frontend/functional/ContactCept.php b/apps/advanced/tests/codeception/frontend/functional/ContactCept.php index 96efefd813..9630b0de83 100644 --- a/apps/advanced/tests/codeception/frontend/functional/ContactCept.php +++ b/apps/advanced/tests/codeception/frontend/functional/ContactCept.php @@ -1,8 +1,8 @@ wantTo('ensure that contact works'); $contactPage = ContactPage::openBy($I); @@ -21,11 +21,11 @@ $I->see('The verification code is incorrect', '.help-block'); $I->amGoingTo('submit contact form with not correct email'); $contactPage->submit([ - 'name' => 'tester', - 'email' => 'tester.email', - 'subject' => 'test subject', - 'body' => 'test content', - 'verifyCode' => 'testme', + 'name' => 'tester', + 'email' => 'tester.email', + 'subject' => 'test subject', + 'body' => 'test content', + 'verifyCode' => 'testme', ]); $I->expectTo('see that email adress is wrong'); $I->dontSee('Name cannot be blank', '.help-block'); @@ -36,10 +36,10 @@ $I->dontSee('The verification code is incorrect', '.help-block'); $I->amGoingTo('submit contact form with correct data'); $contactPage->submit([ - 'name' => 'tester', - 'email' => 'tester@example.com', - 'subject' => 'test subject', - 'body' => 'test content', - 'verifyCode' => 'testme', + 'name' => 'tester', + 'email' => 'tester@example.com', + 'subject' => 'test subject', + 'body' => 'test content', + 'verifyCode' => 'testme', ]); $I->see('Thank you for contacting us. We will respond to you as soon as possible.'); diff --git a/apps/advanced/tests/codeception/frontend/functional/HomeCept.php b/apps/advanced/tests/codeception/frontend/functional/HomeCept.php index 14a88a27b6..c250e43402 100644 --- a/apps/advanced/tests/codeception/frontend/functional/HomeCept.php +++ b/apps/advanced/tests/codeception/frontend/functional/HomeCept.php @@ -1,6 +1,6 @@ wantTo('ensure that home page works'); $I->amOnPage(Yii::$app->homeUrl); $I->see('My Company'); diff --git a/apps/advanced/tests/codeception/frontend/functional/LoginCept.php b/apps/advanced/tests/codeception/frontend/functional/LoginCept.php index 4c81fd52a3..c5d94afa59 100644 --- a/apps/advanced/tests/codeception/frontend/functional/LoginCept.php +++ b/apps/advanced/tests/codeception/frontend/functional/LoginCept.php @@ -1,8 +1,8 @@ wantTo('ensure login page works'); $loginPage = LoginPage::openBy($I); diff --git a/apps/advanced/tests/codeception/frontend/functional/SignupCest.php b/apps/advanced/tests/codeception/frontend/functional/SignupCest.php index d6bfef6433..0ed81b7a22 100644 --- a/apps/advanced/tests/codeception/frontend/functional/SignupCest.php +++ b/apps/advanced/tests/codeception/frontend/functional/SignupCest.php @@ -10,7 +10,7 @@ class SignupCest /** * This method is called before each cest class test method - * @param \Codeception\Event\Test $event + * @param \Codeception\Event\TestEvent $event */ public function _before($event) { @@ -18,7 +18,7 @@ class SignupCest /** * This method is called after each cest class test method, even if test failed. - * @param \Codeception\Event\Test $event + * @param \Codeception\Event\TestEvent $event */ public function _after($event) { @@ -30,7 +30,7 @@ class SignupCest /** * This method is called when test fails. - * @param \Codeception\Event\Fail $event + * @param \Codeception\Event\FailEvent $event */ public function _fail($event) { @@ -39,7 +39,7 @@ class SignupCest /** * - * @param \TestGuy $I + * @param \codeception_frontend\FunctionalTester $I * @param \Codeception\Scenario $scenario */ public function testUserSignup($I, $scenario) @@ -61,9 +61,9 @@ class SignupCest $I->amGoingTo('submit signup form with not correct email'); $signupPage->submit([ - 'username' => 'tester', - 'email' => 'tester.email', - 'password' => 'tester_password', + 'username' => 'tester', + 'email' => 'tester.email', + 'password' => 'tester_password', ]); $I->expectTo('see that email address is wrong'); @@ -73,15 +73,15 @@ class SignupCest $I->amGoingTo('submit signup form with correct email'); $signupPage->submit([ - 'username' => 'tester', - 'email' => 'tester.email@example.com', - 'password' => 'tester_password', + 'username' => 'tester', + 'email' => 'tester.email@example.com', + 'password' => 'tester_password', ]); $I->expectTo('see that user is created'); $I->seeRecord('common\models\User', [ - 'username' => 'tester', - 'email' => 'tester.email@example.com', + 'username' => 'tester', + 'email' => 'tester.email@example.com', ]); $I->expectTo('see that user logged in'); diff --git a/apps/advanced/tests/codeception/frontend/unit.suite.yml b/apps/advanced/tests/codeception/frontend/unit.suite.yml index f0573a843a..a0582a5363 100644 --- a/apps/advanced/tests/codeception/frontend/unit.suite.yml +++ b/apps/advanced/tests/codeception/frontend/unit.suite.yml @@ -3,4 +3,4 @@ # suite for unit (internal) tests. # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES. -class_name: CodeGuy +class_name: UnitTester diff --git a/apps/advanced/tests/codeception/frontend/unit/DbTestCase.php b/apps/advanced/tests/codeception/frontend/unit/DbTestCase.php index c164872dd9..1111f78a93 100644 --- a/apps/advanced/tests/codeception/frontend/unit/DbTestCase.php +++ b/apps/advanced/tests/codeception/frontend/unit/DbTestCase.php @@ -2,6 +2,9 @@ namespace codeception\frontend\unit; +/** + * @inheritdoc + */ class DbTestCase extends \yii\codeception\DbTestCase { public $appConfig = '@codeception/frontend/unit/_config.php'; diff --git a/apps/advanced/tests/codeception/frontend/unit/TestCase.php b/apps/advanced/tests/codeception/frontend/unit/TestCase.php index 06f34fce54..0da48dd063 100644 --- a/apps/advanced/tests/codeception/frontend/unit/TestCase.php +++ b/apps/advanced/tests/codeception/frontend/unit/TestCase.php @@ -2,6 +2,9 @@ namespace codeception\frontend\unit; +/** + * @inheritdoc + */ class TestCase extends \yii\codeception\TestCase { public $appConfig = '@codeception/frontend/unit/_config.php'; diff --git a/apps/basic/tests/codeception/.gitignore b/apps/basic/tests/codeception/.gitignore index c5aa0743de..985dbb4239 100644 --- a/apps/basic/tests/codeception/.gitignore +++ b/apps/basic/tests/codeception/.gitignore @@ -1,4 +1,4 @@ # these files are auto generated by codeception build -/unit/CodeGuy.php -/functional/TestGuy.php -/acceptance/WebGuy.php +/unit/UnitTester.php +/functional/FunctionalTester.php +/acceptance/AcceptanceTester.php diff --git a/apps/basic/tests/codeception/_pages/AboutPage.php b/apps/basic/tests/codeception/_pages/AboutPage.php index 727cd38592..b6ca34a293 100644 --- a/apps/basic/tests/codeception/_pages/AboutPage.php +++ b/apps/basic/tests/codeception/_pages/AboutPage.php @@ -4,6 +4,10 @@ namespace codeception\_pages; use yii\codeception\BasePage; +/** + * Represents about page + * @property \AcceptanceTester|\FunctionalTester $actor + */ class AboutPage extends BasePage { public $route = 'site/about'; diff --git a/apps/basic/tests/codeception/_pages/ContactPage.php b/apps/basic/tests/codeception/_pages/ContactPage.php index 63c053c90e..9561255946 100644 --- a/apps/basic/tests/codeception/_pages/ContactPage.php +++ b/apps/basic/tests/codeception/_pages/ContactPage.php @@ -4,6 +4,10 @@ namespace codeception\_pages; use yii\codeception\BasePage; +/** + * Represents contact page + * @property \AcceptanceTester|\FunctionalTester $actor + */ class ContactPage extends BasePage { public $route = 'site/contact'; @@ -15,8 +19,8 @@ class ContactPage extends BasePage { foreach ($contactData as $field => $value) { $inputType = $field === 'body' ? 'textarea' : 'input'; - $this->guy->fillField($inputType . '[name="ContactForm[' . $field . ']"]', $value); + $this->actor->fillField($inputType . '[name="ContactForm[' . $field . ']"]', $value); } - $this->guy->click('contact-button'); + $this->actor->click('contact-button'); } } diff --git a/apps/basic/tests/codeception/_pages/LoginPage.php b/apps/basic/tests/codeception/_pages/LoginPage.php index 35ada9cd86..af10049630 100644 --- a/apps/basic/tests/codeception/_pages/LoginPage.php +++ b/apps/basic/tests/codeception/_pages/LoginPage.php @@ -4,6 +4,10 @@ namespace codeception\_pages; use yii\codeception\BasePage; +/** + * Represents login page + * @property \AcceptanceTester|\FunctionalTester $actor + */ class LoginPage extends BasePage { public $route = 'site/login'; @@ -14,8 +18,8 @@ class LoginPage extends BasePage */ public function login($username, $password) { - $this->guy->fillField('input[name="LoginForm[username]"]', $username); - $this->guy->fillField('input[name="LoginForm[password]"]', $password); - $this->guy->click('login-button'); + $this->actor->fillField('input[name="LoginForm[username]"]', $username); + $this->actor->fillField('input[name="LoginForm[password]"]', $password); + $this->actor->click('login-button'); } } diff --git a/apps/basic/tests/codeception/acceptance.suite.yml b/apps/basic/tests/codeception/acceptance.suite.yml index bd10f82a16..a045043cd6 100644 --- a/apps/basic/tests/codeception/acceptance.suite.yml +++ b/apps/basic/tests/codeception/acceptance.suite.yml @@ -8,7 +8,7 @@ # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES. -class_name: WebGuy +class_name: AcceptanceTester modules: enabled: - PhpBrowser diff --git a/apps/basic/tests/codeception/acceptance/AboutCept.php b/apps/basic/tests/codeception/acceptance/AboutCept.php index 251cad2741..2dcc6a13b1 100644 --- a/apps/basic/tests/codeception/acceptance/AboutCept.php +++ b/apps/basic/tests/codeception/acceptance/AboutCept.php @@ -2,7 +2,7 @@ use codeception\_pages\AboutPage; -$I = new WebGuy($scenario); +$I = new AcceptanceTester($scenario); $I->wantTo('ensure that about works'); AboutPage::openBy($I); $I->see('About', 'h1'); diff --git a/apps/basic/tests/codeception/acceptance/ContactCept.php b/apps/basic/tests/codeception/acceptance/ContactCept.php index 50aa69acb4..27858f8e90 100644 --- a/apps/basic/tests/codeception/acceptance/ContactCept.php +++ b/apps/basic/tests/codeception/acceptance/ContactCept.php @@ -2,7 +2,7 @@ use codeception\_pages\ContactPage; -$I = new WebGuy($scenario); +$I = new AcceptanceTester($scenario); $I->wantTo('ensure that contact works'); $contactPage = ContactPage::openBy($I); diff --git a/apps/basic/tests/codeception/acceptance/HomeCept.php b/apps/basic/tests/codeception/acceptance/HomeCept.php index 62456f930e..369ab7f481 100644 --- a/apps/basic/tests/codeception/acceptance/HomeCept.php +++ b/apps/basic/tests/codeception/acceptance/HomeCept.php @@ -1,6 +1,6 @@ wantTo('ensure that home page works'); $I->amOnPage(Yii::$app->homeUrl); $I->see('My Company'); diff --git a/apps/basic/tests/codeception/acceptance/LoginCept.php b/apps/basic/tests/codeception/acceptance/LoginCept.php index ff093b3bd3..6d07c08958 100644 --- a/apps/basic/tests/codeception/acceptance/LoginCept.php +++ b/apps/basic/tests/codeception/acceptance/LoginCept.php @@ -2,7 +2,7 @@ use codeception\_pages\LoginPage; -$I = new WebGuy($scenario); +$I = new AcceptanceTester($scenario); $I->wantTo('ensure that login works'); $loginPage = LoginPage::openBy($I); diff --git a/apps/basic/tests/codeception/functional.suite.yml b/apps/basic/tests/codeception/functional.suite.yml index 3b5008139a..94ff0c9767 100644 --- a/apps/basic/tests/codeception/functional.suite.yml +++ b/apps/basic/tests/codeception/functional.suite.yml @@ -6,7 +6,7 @@ # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES. #basic/web/index.php -class_name: TestGuy +class_name: FunctionalTester modules: enabled: - Filesystem diff --git a/apps/basic/tests/codeception/functional/AboutCept.php b/apps/basic/tests/codeception/functional/AboutCept.php index 6312061444..3edd61da31 100644 --- a/apps/basic/tests/codeception/functional/AboutCept.php +++ b/apps/basic/tests/codeception/functional/AboutCept.php @@ -2,7 +2,7 @@ use codeception\_pages\AboutPage; -$I = new TestGuy($scenario); +$I = new FunctionalTester($scenario); $I->wantTo('ensure that about works'); AboutPage::openBy($I); $I->see('About', 'h1'); diff --git a/apps/basic/tests/codeception/functional/ContactCept.php b/apps/basic/tests/codeception/functional/ContactCept.php index f13b51cf28..c5e83b4f19 100644 --- a/apps/basic/tests/codeception/functional/ContactCept.php +++ b/apps/basic/tests/codeception/functional/ContactCept.php @@ -2,7 +2,7 @@ use codeception\_pages\ContactPage; -$I = new TestGuy($scenario); +$I = new FunctionalTester($scenario); $I->wantTo('ensure that contact works'); $contactPage = ContactPage::openBy($I); diff --git a/apps/basic/tests/codeception/functional/HomeCept.php b/apps/basic/tests/codeception/functional/HomeCept.php index 3258ba3331..80aa551fc9 100644 --- a/apps/basic/tests/codeception/functional/HomeCept.php +++ b/apps/basic/tests/codeception/functional/HomeCept.php @@ -1,6 +1,6 @@ wantTo('ensure that home page works'); $I->amOnPage(Yii::$app->homeUrl); $I->see('My Company'); diff --git a/apps/basic/tests/codeception/functional/LoginCept.php b/apps/basic/tests/codeception/functional/LoginCept.php index 77189b8854..4cb283ac97 100644 --- a/apps/basic/tests/codeception/functional/LoginCept.php +++ b/apps/basic/tests/codeception/functional/LoginCept.php @@ -2,7 +2,7 @@ use codeception\_pages\LoginPage; -$I = new TestGuy($scenario); +$I = new FunctionalTester($scenario); $I->wantTo('ensure that login works'); $loginPage = LoginPage::openBy($I); diff --git a/apps/basic/tests/codeception/unit.suite.yml b/apps/basic/tests/codeception/unit.suite.yml index f0573a843a..a0582a5363 100644 --- a/apps/basic/tests/codeception/unit.suite.yml +++ b/apps/basic/tests/codeception/unit.suite.yml @@ -3,4 +3,4 @@ # suite for unit (internal) tests. # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES. -class_name: CodeGuy +class_name: UnitTester diff --git a/extensions/codeception/BasePage.php b/extensions/codeception/BasePage.php index f3a8ae15dc..133632557c 100644 --- a/extensions/codeception/BasePage.php +++ b/extensions/codeception/BasePage.php @@ -29,19 +29,19 @@ abstract class BasePage extends Component public $route; /** - * @var \Codeception\AbstractGuy the testing guy object + * @var \Codeception\Actor the testing guy object */ - protected $guy; + protected $actor; /** * Constructor. * - * @param \Codeception\AbstractGuy $I the testing guy object + * @param \Codeception\Actor $I the testing guy object */ public function __construct($I) { - $this->guy = $I; + $this->actor = $I; } /** @@ -67,7 +67,7 @@ abstract class BasePage extends Component /** * Creates a page instance and sets the test guy to use [[url]]. - * @param \Codeception\AbstractGuy $I the test guy instance + * @param \Codeception\Actor $I the test guy instance * @param array $params the GET parameters to be used to generate [[url]] * @return static the page instance */ diff --git a/extensions/codeception/DbTestCase.php b/extensions/codeception/DbTestCase.php index e962e7ab79..c5e3cf9a76 100644 --- a/extensions/codeception/DbTestCase.php +++ b/extensions/codeception/DbTestCase.php @@ -10,6 +10,8 @@ namespace yii\codeception; use yii\test\InitDbFixture; /** + * Base class for database test cases + * * @author Qiang Xue * @since 2.0 */ diff --git a/extensions/codeception/README.md b/extensions/codeception/README.md index 0543201491..68ced92707 100644 --- a/extensions/codeception/README.md +++ b/extensions/codeception/README.md @@ -52,11 +52,11 @@ If you want to use codeception modules and helpers in your unit tests, you can d $this->getModule('CodeHelper'); #or some other module ``` -You also can use all guy methods by accessing guy instance like: +You also can use all actor methods by accessing actor instance like: ```php codeGuy->someMethodFromModule(); +$this->unitTester->someMethodFromModule(); ``` Codeception events ------------------