Codeception test adjustments for basic and advanced applications

.travis.yml

@@ -47,10 +47,8 @@ before_script:
 
 script:
   - vendor/bin/phpunit --verbose --coverage-clover=coverage.clover --exclude-group mssql,oci,wincache,xcache,zenddata
-  - cd apps/basic && php vendor/bin/codecept run
-  - cd ../advanced/backend && ../vendor/bin/codecept run
-  - cd ../common && ../vendor/bin/codecept run
-  - cd ../frontend && ../vendor/bin/codecept run
+  - cd apps/basic/tests && php ../vendor/bin/codecept run
+  - cd ../../advanced/tests && ../vendor/bin/codecept run
 
 after_script:
   - cd ../../..

apps/advanced/README.md

@@ -95,35 +95,3 @@ the installed application. You only need to do these once for all.
 
 To login into the application, you need to first sign up, with any of your email address, username and password.
 Then, you can login into the application with same email address and password at any time.
-
-TESTING
--------
-
-Install additional composer packages:
-* `php composer.phar require --dev codeception/codeception:2.0.* codeception/specify:* codeception/verify:* yiisoft/yii2-faker:*`
-
-This application boilerplate use database in testing, so you should create three databases that are used in tests:
-* `yii2_advanced_unit` - database for unit tests;
-* `yii2_advanced_functional` - database for functional tests;
-* `yii2_advanced_acceptance` - database for acceptance tests.
-
-To make your database up to date, you can run in needed test folder `yii migrate`, for example
-if you are starting from `frontend` tests then you should run `yii migrate` in each suite folder `acceptance`, `functional`, `unit`
-it will upgrade your database to the last state according migrations.
-
-To be able to run acceptance tests you need a running webserver. For this you can use the php builtin server and run it in the directory where your main project folder is located. For example if your application is located in `/www/advanced` all you need to is:
-`cd /www` and then `php -S 127.0.0.1:8080` because the default configuration of acceptance tests expects the url of the application to be `/advanced/`.
-If you already have a server configured or your application is not located in a folder called `advanced`, you may need to adjust the `test_entry_url` in `backend/codeception.yml` and `frontend/codeception.yml`.
-
-After that is done you should be able to run your tests, for example to run `frontend` tests do:
-
-* `cd frontend`
-* `../vendor/bin/codecept build`
-* `../vendor/bin/codecept run`
-
-In similar way you can run tests for other application tiers - `backend`, `console`, `common`.
-
-If you already have run `../vendor/bin/codecept build` for each application, you can run all tests by one command: `vendor/bin/codecept run`
-
-You also can adjust you application suite configs and `_bootstrap.php` settings to use other urls and files, as it is can be done in `yii2-basic`.
-Current template also includes [yii2-faker](https://github.com/yiisoft/yii2/tree/master/extensions/faker) extension, that is correctly setup for each application tier.

apps/advanced/backend/tests/acceptance/_console.php

-<?php
-
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../../common/config/main.php'),
-    require(__DIR__ . '/../../../common/config/main-local.php'),
-    require(__DIR__ . '/../../../console/config/main.php'),
-    require(__DIR__ . '/../../../console/config/main-local.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_acceptance',
-            ],
-        ],
-    ]
-);

apps/advanced/backend/tests/acceptance/yii

-#!/usr/bin/env php
-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-// fcgi doesn't have STDIN and STDOUT defined by default
-defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
-defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
-
-require_once(__DIR__ . '/../_console.php');
-
-$config = require(__DIR__ . '/_console.php');
-
-$application = new yii\console\Application($config);
-$exitCode = $application->run();
-exit($exitCode);

apps/advanced/backend/tests/functional/_console.php

-<?php
-
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../../common/config/main.php'),
-    require(__DIR__ . '/../../../common/config/main-local.php'),
-    require(__DIR__ . '/../../../console/config/main.php'),
-    require(__DIR__ . '/../../../console/config/main-local.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_functional',
-            ],
-        ],
-    ]
-);

apps/advanced/backend/tests/functional/yii

-#!/usr/bin/env php
-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-// fcgi doesn't have STDIN and STDOUT defined by default
-defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
-defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
-
-require_once(__DIR__ . '/../_console.php');
-
-$config = require(__DIR__ . '/_console.php');
-
-$application = new yii\console\Application($config);
-$exitCode = $application->run();
-exit($exitCode);

apps/advanced/backend/tests/unit/yii

-#!/usr/bin/env php
-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-// fcgi doesn't have STDIN and STDOUT defined by default
-defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
-defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
-
-require_once(__DIR__ . '/../_console.php');
-
-$config = require(__DIR__ . '/_console.php');
-
-$application = new yii\console\Application($config);
-$exitCode = $application->run();
-exit($exitCode);

apps/advanced/codeception.yml

-include:
-  - common
-  - console
-  - backend
-  - frontend
-
-paths:
-  log: tests/_log
-
-settings:
-  colors: true

apps/advanced/common/codeception.yml

-namespace: common
-actor: Tester
-paths:
-    tests: tests
-    log: tests/_log
-    data: tests/_data
-    helpers: tests/_helpers
-settings:
-    bootstrap: _bootstrap.php
-    suite_class: \PHPUnit_Framework_TestSuite
-    colors: true
-    memory_limit: 1024M
-    log: true
-modules:
-    config:
-        Db:
-            dsn: ''
-            user: ''
-            password: ''
-            dump: tests/_data/dump.sql

apps/advanced/common/tests/_console.php

-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-// fcgi doesn't have STDIN and STDOUT defined by default
-defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
-defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
-
-require_once(__DIR__ . '/../../vendor/autoload.php');
-require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
-require_once(__DIR__ . '/../../common/config/aliases.php');
-
-defined('YII_DEBUG') or define('YII_DEBUG', true);
-defined('YII_ENV') or define('YII_ENV', 'test');

apps/advanced/common/tests/_data/dump.sql

-/* Replace this file with actual dump of your database */
\ No newline at end of file

apps/advanced/common/tests/unit/_console.php

-<?php
-
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../../console/config/main.php'),
-    require(__DIR__ . '/../../../console/config/main-local.php'),
-    require(__DIR__ . '/../../config/main.php'),
-    require(__DIR__ . '/../../config/main-local.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_unit',
-            ],
-        ],
-        'controllerMap' => [
-            'fixture' => [
-                'class' => 'yii\faker\FixtureController',
-                'fixtureDataPath' => '@common/tests/unit/fixtures/data',
-                'templatePath' => '@common/tests/templates/fixtures'
-            ],
-        ],
-    ]
-);

apps/advanced/common/tests/unit/yii

-#!/usr/bin/env php
-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-// fcgi doesn't have STDIN and STDOUT defined by default
-defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
-defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
-
-require_once(__DIR__ . '/../_console.php');
-
-$config = require(__DIR__ . '/_console.php');
-
-$application = new yii\console\Application($config);
-$exitCode = $application->run();
-exit($exitCode);

apps/advanced/composer.json

@@ -22,13 +22,8 @@
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
         "yiisoft/yii2-debug": "*",
-        "yiisoft/yii2-gii": "*"
-    },
-    "suggest": {
-        "codeception/codeception": "Codeception, 2.0.* is currently works well with Yii.",
-        "codeception/specify": "BDD style code blocks for PHPUnit and Codeception",
-        "codeception/verify": "BDD Assertions for PHPUnit and Codeception",
-        "yiisoft/yii2-faker": "Fixtures generator for Yii2 based on Faker lib"
+        "yiisoft/yii2-gii": "*",
+        "yiisoft/yii2-faker": "*"
     },
     "scripts": {
         "post-create-project-cmd": [

apps/advanced/console/codeception.yml

-namespace: console
-actor: Tester
-paths:
-    tests: tests
-    log: tests/_log
-    data: tests/_data
-    helpers: tests/_helpers
-settings:
-    bootstrap: _bootstrap.php
-    suite_class: \PHPUnit_Framework_TestSuite
-    colors: true
-    memory_limit: 1024M
-    log: true
-modules:
-    config:
-        Db:
-            dsn: ''
-            user: ''
-            password: ''
-            dump: tests/_data/dump.sql

apps/advanced/console/tests/_console.php

-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-// fcgi doesn't have STDIN and STDOUT defined by default
-defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
-defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
-
-require_once(__DIR__ . '/../../vendor/autoload.php');
-require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
-require_once(__DIR__ . '/../../common/config/aliases.php');
-
-defined('YII_DEBUG') or define('YII_DEBUG', true);
-defined('YII_ENV') or define('YII_ENV', 'test');

apps/advanced/console/tests/_data/dump.sql

-/* Replace this file with actual dump of your database */
\ No newline at end of file

apps/advanced/console/tests/unit/_console.php

-<?php
-
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../../common/config/main.php'),
-    require(__DIR__ . '/../../../common/config/main-local.php'),
-    require(__DIR__ . '/../../config/main.php'),
-    require(__DIR__ . '/../../config/main-local.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_unit',
-            ],
-        ],
-        'controllerMap' => [
-            'fixture' => [
-                'class' => 'yii\faker\FixtureController',
-                'fixtureDataPath' => '@console/tests/unit/fixtures/data',
-                'templatePath' => '@common/tests/templates/fixtures'
-            ],
-        ],
-    ]
-);

apps/advanced/console/tests/unit/yii

-#!/usr/bin/env php
-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-// fcgi doesn't have STDIN and STDOUT defined by default
-defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
-defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
-
-require_once(__DIR__ . '/../_console.php');
-
-$config = require(__DIR__ . '/_console.php');
-
-$application = new yii\console\Application($config);
-$exitCode = $application->run();
-exit($exitCode);

apps/advanced/frontend/tests/_console.php

-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-// fcgi doesn't have STDIN and STDOUT defined by default
-defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
-defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
-
-require_once(__DIR__ . '/../../vendor/autoload.php');
-require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
-require_once(__DIR__ . '/../../common/config/aliases.php');
-
-defined('YII_DEBUG') or define('YII_DEBUG', true);
-defined('YII_ENV') or define('YII_ENV', 'test');

apps/advanced/frontend/tests/_data/dump.sql

-/* Replace this file with actual dump of your database */
\ No newline at end of file

apps/advanced/frontend/tests/acceptance/_console.php

-<?php
-
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../../common/config/main.php'),
-    require(__DIR__ . '/../../../common/config/main-local.php'),
-    require(__DIR__ . '/../../../console/config/main.php'),
-    require(__DIR__ . '/../../../console/config/main-local.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_acceptance',
-            ],
-        ],
-    ]
-);

apps/advanced/frontend/tests/acceptance/yii

-#!/usr/bin/env php
-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-// fcgi doesn't have STDIN and STDOUT defined by default
-defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
-defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
-
-require_once(__DIR__ . '/../_console.php');
-
-$config = require(__DIR__ . '/_console.php');
-
-$application = new yii\console\Application($config);
-$exitCode = $application->run();
-exit($exitCode);

apps/advanced/frontend/tests/functional/_console.php

-<?php
-
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../../common/config/main.php'),
-    require(__DIR__ . '/../../../common/config/main-local.php'),
-    require(__DIR__ . '/../../../console/config/main.php'),
-    require(__DIR__ . '/../../../console/config/main-local.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_functional',
-            ],
-        ],
-    ]
-);

apps/advanced/frontend/tests/functional/yii

-#!/usr/bin/env php
-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-// fcgi doesn't have STDIN and STDOUT defined by default
-defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
-defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
-
-require_once(__DIR__ . '/../_console.php');
-
-$config = require(__DIR__ . '/_console.php');
-
-$application = new yii\console\Application($config);
-$exitCode = $application->run();
-exit($exitCode);

apps/advanced/frontend/tests/functional/yii.bat

-@echo off
-
-rem -------------------------------------------------------------
-rem  Yii command line bootstrap script for Windows.
-rem
-rem  @author Qiang Xue <qiang.xue@gmail.com>
-rem  @link http://www.yiiframework.com/
-rem  @copyright Copyright &copy; 2012 Yii Software LLC
-rem  @license http://www.yiiframework.com/license/
-rem -------------------------------------------------------------
-
-@setlocal
-
-set YII_PATH=%~dp0
-
-if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
-
-"%PHP_COMMAND%" "%YII_PATH%yii" %*
-
-@endlocal

apps/advanced/frontend/tests/unit/_config.php

-<?php
-
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../../common/config/main.php'),
-    require(__DIR__ . '/../../../common/config/main-local.php'),
-    require(__DIR__ . '/../../config/main.php'),
-    require(__DIR__ . '/../../config/main-local.php'),
-    require(__DIR__ . '/../_config.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_unit',
-            ],
-        ],
-    ]
-);

apps/advanced/frontend/tests/unit/_console.php

-<?php
-
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../../common/config/main.php'),
-    require(__DIR__ . '/../../../common/config/main-local.php'),
-    require(__DIR__ . '/../../../console/config/main.php'),
-    require(__DIR__ . '/../../../console/config/main-local.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_unit',
-            ],
-        ],
-        'controllerMap' => [
-            'fixture' => [
-                'class' => 'yii\faker\FixtureController',
-                'fixtureDataPath' => '@frontend/tests/unit/fixtures/data',
-                'templatePath' => '@common/tests/templates/fixtures'
-            ],
-        ],
-    ]
-);

apps/advanced/frontend/tests/unit/yii

-#!/usr/bin/env php
-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-// fcgi doesn't have STDIN and STDOUT defined by default
-defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
-defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
-
-require_once(__DIR__ . '/../_console.php');
-
-$config = require(__DIR__ . '/_console.php');
-
-$application = new yii\console\Application($config);
-$exitCode = $application->run();
-exit($exitCode);

apps/advanced/frontend/tests/unit/yii.bat

-@echo off
-
-rem -------------------------------------------------------------
-rem  Yii command line bootstrap script for Windows.
-rem
-rem  @author Qiang Xue <qiang.xue@gmail.com>
-rem  @link http://www.yiiframework.com/
-rem  @copyright Copyright &copy; 2012 Yii Software LLC
-rem  @license http://www.yiiframework.com/license/
-rem -------------------------------------------------------------
-
-@setlocal
-
-set YII_PATH=%~dp0
-
-if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
-
-"%PHP_COMMAND%" "%YII_PATH%yii" %*
-
-@endlocal

apps/advanced/tests/README.md

+This directory contains various tests for the advanced applications.
+
+Tests in `codeception` directory are developed with [Codeception PHP Testing Framework](http://codeception.com/).
+
+After creating and setting up the advanced application, follow these steps to prepare for the tests:
+
+1. Install Codeception if it's not yet installed:
+
+```
+composer global require "codeception/codeception=2.0.*"
+composer global require "codeception/specify=*"
+composer global require "codeception/verify=*"
+```
+
+If you've never used Composer for global packages run `composer global status`. It should output:
+
+```
+Changed current directory to <directory>
+```
+
+Then add `<directory>/vendor/bin` to you `PATH` environment variable. Now we're able to use `codecept` from command
+line globally.
+
+2. Install faker extension by running the following from template root directory where `composer.json` is:
+
+```
+composer require --dev yiisoft/yii2-faker:*
+```
+
+
+3. Create three databases that are used in tests:
+
+* `yii2_advanced_unit` - for unit tests;
+* `yii2_advanced_functional` - for functional tests;
+* `yii2_advanced_acceptance` - for acceptance tests.
+
+Then update databases by applying migrations:
+
+```
+codeception/bin/yii_acceptance migrate
+codeception/bin/yii_functional migrate
+codeception/bin/yii_unit migrate
+```
+
+4. In order to be able to run acceptance tests you need to start a webserver. The simplest way is to use PHP built in
+webserver. In the root directory where `common`, `frontend` etc. are execute the following:
+
+```
+php -S localhost:8080
+```
+
+5. Now you can run the tests with the following commands:
+
+```
+# frontend tests
+cd frontend
+codecept build
+codecept run
+
+# backend tests
+
+cd backend
+codecept build
+codecept run
+
+# etc.
+```
+
+If you already have run `codecept build` for each application, you can run all tests by a single `codecept run` in the
+`tests` directory.

apps/advanced/tests/codeception.yml

+include:
+  - codeception/common
+  - codeception/console
+  - codeception/backend
+  - codeception/frontend
+
+paths:
+  log: codeception/_log
+
+settings:
+  colors: true

apps/advanced/backend/tests/_bootstrap.php → apps/advanced/tests/codeception/backend/_bootstrap.php

@@ -4,15 +4,17 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 defined('YII_ENV') or define('YII_ENV', 'test');
 
-require_once(__DIR__ . '/../../vendor/autoload.php');
+defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__))));
 
-require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
-
-require(__DIR__ . '/../../common/config/aliases.php');
+require_once(ROOT_DIR . '/vendor/autoload.php');
+require_once(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
+require(ROOT_DIR . '/common/config/aliases.php');
 
 // set correct script paths
 
 // the entry script file path for functional and acceptance tests
-$_SERVER['SCRIPT_FILENAME'] = dirname(__DIR__) . '/web/index-test.php';
+$_SERVER['SCRIPT_FILENAME'] = ROOT_DIR . '/backend/web/index-test.php';
 $_SERVER['SCRIPT_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url'];
 $_SERVER['SERVER_NAME'] = 'localhost';
+
+Yii::setAlias('@codeception', dirname(__DIR__));

apps/advanced/backend/tests/acceptance.suite.yml → apps/advanced/tests/codeception/backend/acceptance.suite.yml

@@ -12,7 +12,7 @@ class_name: WebGuy
 modules:
     enabled:
         - PhpBrowser
-        - common\tests\_helpers\FixtureHelper
+        - codeception\common\_helpers\FixtureHelper
 # you can use WebDriver instead of PhpBrowser to test javascript and ajax.
 # This will require you to install selenium. See http://codeception.com/docs/04-AcceptanceTests#Selenium
 # "restart" option is used by the WebDriver to start each time per test-file new session and cookies,

apps/advanced/backend/tests/acceptance/LoginCept.php → apps/advanced/tests/codeception/backend/acceptance/LoginCept.php

 <?php
 
-use common\tests\_pages\LoginPage;
-use backend\WebGuy;
+use codeception_backend\WebGuy;
+use codeception\common\_pages\LoginPage;
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure login page works');

apps/advanced/backend/tests/acceptance/_config.php → apps/advanced/tests/codeception/backend/acceptance/_config.php

 <?php
-
+defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(dirname(__DIR__)))));
 return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/main.php'),
-    require(__DIR__ . '/../../config/main-local.php'),
-    require(__DIR__ . '/../../../common/config/main.php'),
-    require(__DIR__ . '/../../../common/config/main-local.php'),
+    require(ROOT_DIR . '/backend/config/main.php'),
+    require(ROOT_DIR . '/backend/config/main-local.php'),
+    require(ROOT_DIR . '/common/config/main.php'),
+    require(ROOT_DIR . '/common/config/main-local.php'),
     require(__DIR__ . '/../_config.php'),
     [
         'components' => [

apps/advanced/backend/codeception.yml → apps/advanced/tests/codeception/backend/codeception.yml

-namespace: backend
+namespace: codeception_backend
 actor: Tester
 paths:
-    tests: tests
-    log: tests/_log
-    data: tests/_data
-    helpers: tests/_helpers
+    tests: .
+    log: _log
+    data: _data
+    helpers: _helpers
 settings:
     bootstrap: _bootstrap.php
     suite_class: \PHPUnit_Framework_TestSuite
     colors: true
     memory_limit: 1024M
     log: true
-modules:
-    config:
-        Db:
-            dsn: ''
-            user: ''
-            password: ''
-            dump: tests/_data/dump.sql
 config:
     # the entry script URL (without host info) for functional and acceptance tests
     # PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
-    test_entry_url: /advanced/backend/web/index-test.php
+    test_entry_url: /backend/web/index-test.php

apps/advanced/backend/tests/functional.suite.yml → apps/advanced/tests/codeception/backend/functional.suite.yml

@@ -11,7 +11,7 @@ modules:
     enabled:
       - Filesystem
       - Yii2
-      - common\tests\_helpers\FixtureHelper
+      - codeception\common\_helpers\FixtureHelper
     config:
         Yii2:
-            configFile: 'tests/functional/_config.php'
+            configFile: 'functional/_config.php'

apps/advanced/backend/tests/functional/LoginCept.php → apps/advanced/tests/codeception/backend/functional/LoginCept.php

 <?php
 
-use common\tests\_pages\LoginPage;
-use backend\TestGuy;
+use codeception_backend\TestGuy;
+use codeception\common\_pages\LoginPage;
 
 $I = new TestGuy($scenario);
 $I->wantTo('ensure login page works');

apps/advanced/backend/tests/functional/_config.php → apps/advanced/tests/codeception/backend/functional/_config.php

 <?php
 
 // set correct script paths
-$_SERVER['SCRIPT_FILENAME'] = dirname(dirname(__DIR__)) . '/web/index-test.php';
+$_SERVER['SCRIPT_FILENAME'] = ROOT_DIR. '/backend/web/index-test.php';
 $_SERVER['SCRIPT_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url'];;
 
 return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/main.php'),
-    require(__DIR__ . '/../../config/main-local.php'),
-    require(__DIR__ . '/../../../common/config/main.php'),
-    require(__DIR__ . '/../../../common/config/main-local.php'),
+    require(ROOT_DIR . '/backend/config/main.php'),
+    require(ROOT_DIR . '/backend/config/main-local.php'),
+    require(ROOT_DIR . '/common/config/main.php'),
+    require(ROOT_DIR . '/common/config/main-local.php'),
     require(__DIR__ . '/../_config.php'),
     [
         'components' => [

apps/advanced/console/tests/unit/_config.php → apps/advanced/tests/codeception/backend/unit/_config.php

 <?php
 
 return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../../common/config/main.php'),
-    require(__DIR__ . '/../../../common/config/main-local.php'),
-    require(__DIR__ . '/../../config/main.php'),
-    require(__DIR__ . '/../../config/main-local.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(ROOT_DIR . '/common/config/main.php'),
+    require(ROOT_DIR . '/common/config/main-local.php'),
+    require(ROOT_DIR . '/backend/config/main.php'),
+    require(ROOT_DIR . '/backend/config/main-local.php'),
+    require(dirname(__DIR__) . '/_config.php'),
     [
         'components' => [
             'db' => [

apps/advanced/backend/tests/_console.php → apps/advanced/tests/codeception/bin/_console_bootstrap.php

@@ -11,9 +11,11 @@
 defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
 defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
 
-require_once(__DIR__ . '/../../vendor/autoload.php');
-require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
-require_once(__DIR__ . '/../../common/config/aliases.php');
+defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__))));
+
+require_once(ROOT_DIR . '/vendor/autoload.php');
+require_once(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
+require_once(ROOT_DIR . '/common/config/aliases.php');
 
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 defined('YII_ENV') or define('YII_ENV', 'test');

apps/advanced/tests/codeception/bin/yii_acceptance

+#!/usr/bin/env php
+<?php
+/**
+ * Yii console bootstrap file.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+require_once __DIR__ . '/_console_bootstrap.php';
+
+$config = yii\helpers\ArrayHelper::merge(
+    require(ROOT_DIR . '/common/config/main.php'),
+    require(ROOT_DIR . '/common/config/main-local.php'),
+    require(ROOT_DIR . '/console/config/main.php'),
+    require(ROOT_DIR . '/console/config/main-local.php'),
+    [
+        'components' => [
+            'db' => [
+                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_acceptance',
+            ],
+        ],
+        'controllerMap' => [
+            'fixture' => [
+                'class' => 'yii\faker\FixtureController',
+                'fixtureDataPath' => dirname(__DIR__) . '_data/fixtures',
+                'templatePath' => dirname(__DIR__) . '_data/templates'
+            ],
+        ],
+    ]
+);
+
+$application = new yii\console\Application($config);
+$exitCode = $application->run();
+exit($exitCode);

apps/advanced/backend/tests/acceptance/yii.bat → apps/advanced/tests/codeception/bin/yii_acceptance.bat

@@ -15,6 +15,6 @@ set YII_PATH=%~dp0
 
 if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
 
-"%PHP_COMMAND%" "%YII_PATH%yii" %*
+"%PHP_COMMAND%" "%YII_PATH%yii_acceptance" %*
 
 @endlocal

apps/advanced/tests/codeception/bin/yii_functional

+#!/usr/bin/env php
+<?php
+/**
+ * Yii console bootstrap file.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+require_once __DIR__ . '/_console_bootstrap.php';
+
+$config = yii\helpers\ArrayHelper::merge(
+    require(ROOT_DIR . '/common/config/main.php'),
+    require(ROOT_DIR . '/common/config/main-local.php'),
+    require(ROOT_DIR . '/console/config/main.php'),
+    require(ROOT_DIR . '/console/config/main-local.php'),
+    [
+        'components' => [
+            'db' => [
+                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_functional',
+            ],
+        ],
+        'controllerMap' => [
+            'fixture' => [
+                'class' => 'yii\faker\FixtureController',
+                'fixtureDataPath' => dirname(__DIR__) . '_data/fixtures',
+                'templatePath' => dirname(__DIR__) . '_data/templates'
+            ],
+        ],
+    ]
+);
+
+$application = new yii\console\Application($config);
+$exitCode = $application->run();
+exit($exitCode);

apps/advanced/backend/tests/functional/yii.bat → apps/advanced/tests/codeception/bin/yii_functional.bat

@@ -15,6 +15,6 @@ set YII_PATH=%~dp0
 
 if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
 
-"%PHP_COMMAND%" "%YII_PATH%yii" %*
+"%PHP_COMMAND%" "%YII_PATH%yii_functional" %*
 
 @endlocal

apps/advanced/backend/tests/unit/_console.php → apps/advanced/tests/codeception/bin/yii_unit

+#!/usr/bin/env php
 <?php
+/**
+ * Yii console bootstrap file.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../../common/config/main.php'),
-    require(__DIR__ . '/../../../common/config/main-local.php'),
-    require(__DIR__ . '/../../../console/config/main.php'),
-    require(__DIR__ . '/../../../console/config/main-local.php'),
+require_once __DIR__ . '/_console_bootstrap.php';
+
+$config = yii\helpers\ArrayHelper::merge(
+    require(ROOT_DIR . '/common/config/main.php'),
+    require(ROOT_DIR . '/common/config/main-local.php'),
+    require(ROOT_DIR . '/console/config/main.php'),
+    require(ROOT_DIR . '/console/config/main-local.php'),
     [
         'components' => [
             'db' => [
@@ -14,9 +24,13 @@ return yii\helpers\ArrayHelper::merge(
         'controllerMap' => [
             'fixture' => [
                 'class' => 'yii\faker\FixtureController',
-                'fixtureDataPath' => '@backend/tests/unit/fixtures/data',
-                'templatePath' => '@commmon/tests/templates/fixtures'
+                'fixtureDataPath' => dirname(__DIR__) . '_data/fixtures',
+                'templatePath' => dirname(__DIR__) . '_data/templates'
             ],
         ],
     ]
 );
+
+$application = new yii\console\Application($config);
+$exitCode = $application->run();
+exit($exitCode);

apps/advanced/backend/tests/unit/yii.bat → apps/advanced/tests/codeception/bin/yii_unit.bat

@@ -15,6 +15,6 @@ set YII_PATH=%~dp0
 
 if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
 
-"%PHP_COMMAND%" "%YII_PATH%yii" %*
+"%PHP_COMMAND%" "%YII_PATH%yii_unit" %*
 
 @endlocal

apps/advanced/common/tests/_bootstrap.php → apps/advanced/tests/codeception/common/_bootstrap.php

@@ -4,11 +4,13 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 defined('YII_ENV') or define('YII_ENV', 'test');
 
-require_once(__DIR__ . '/../../vendor/autoload.php');
+defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__))));
 
-require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
-
-require(__DIR__ . '/../../common/config/aliases.php');
+require_once(ROOT_DIR . '/vendor/autoload.php');
+require_once(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
+require(ROOT_DIR . '/common/config/aliases.php');
 
 // set correct script paths
 $_SERVER['SERVER_NAME'] = 'localhost';
+
+Yii::setAlias('@codeception', dirname(__DIR__));
\ No newline at end of file

apps/advanced/common/tests/_helpers/FixtureHelper.php → apps/advanced/tests/codeception/common/_helpers/FixtureHelper.php

 <?php
 
-namespace common\tests\_helpers;
+namespace codeception\common\_helpers;
 
+use codeception\common\fixtures\UserFixture;
 use Codeception\Module;
 use yii\test\FixtureTrait;
-use common\tests\fixtures\UserFixture;
 
 /**
  * This helper is used to populate database with needed fixtures before any tests should be run.
@@ -53,7 +53,7 @@ class FixtureHelper extends Module
         return [
             'user' => [
                 'class' =>  UserFixture::className(),
-                'dataFile' => '@common/tests/fixtures/data/init_login.php',
+                'dataFile' => '@codeception/common/fixtures/data/init_login.php',
             ],
         ];
     }

apps/advanced/common/tests/_pages/LoginPage.php → apps/advanced/tests/codeception/common/_pages/LoginPage.php

 <?php
 
-namespace common\tests\_pages;
+namespace codeception\common\_pages;
 
 use yii\codeception\BasePage;
 

apps/advanced/tests/codeception/common/codeception.yml

+namespace: codeception_common
+actor: Tester
+paths:
+    tests: .
+    log: _log
+    data: _data
+    helpers: _helpers
+settings:
+    bootstrap: _bootstrap.php
+    suite_class: \PHPUnit_Framework_TestSuite
+    colors: true
+    memory_limit: 1024M
+    log: true

apps/advanced/common/tests/fixtures/UserFixture.php → apps/advanced/tests/codeception/common/fixtures/UserFixture.php

 <?php
 
-namespace common\tests\fixtures;
+namespace codeception\common\fixtures;
 
 use yii\test\ActiveFixture;
 

apps/advanced/frontend/tests/unit/DbTestCase.php → apps/advanced/tests/codeception/common/unit/DbTestCase.php

 <?php
 
-namespace frontend\tests\unit;
+namespace codeception\common\unit;
 
 class DbTestCase extends \yii\codeception\DbTestCase
 {
-    public $appConfig = '@frontend/tests/unit/_config.php';
+    public $appConfig = '@codeception/common/unit/_config.php';
 }

apps/advanced/common/tests/unit/_config.php → apps/advanced/tests/codeception/common/unit/_config.php

 <?php
 
 return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/main.php'),
-    require(__DIR__ . '/../../config/main-local.php'),
+    require(ROOT_DIR . '/common/config/main.php'),
+    require(ROOT_DIR . '/common/config/main-local.php'),
     require(__DIR__ . '/../_config.php'),
     [
         'components' => [

apps/advanced/common/tests/unit/models/LoginFormTest.php → apps/advanced/tests/codeception/common/unit/models/LoginFormTest.php

 <?php
 
-namespace common\tests\unit\models;
+namespace codeception\common\unit\models;
 
 use Yii;
-use common\tests\unit\DbTestCase;
+use codeception\common\unit\DbTestCase;
 use Codeception\Specify;
 use common\models\LoginForm;
-use common\tests\fixtures\UserFixture;
+use codeception\common\fixtures\UserFixture;
 
 class LoginFormTest extends DbTestCase
 {
@@ -80,7 +80,7 @@ class LoginFormTest extends DbTestCase
         return [
             'user' => [
                 'class' => UserFixture::className(),
-                'dataFile' => '@common/tests/unit/fixtures/data/models/user.php'
+                'dataFile' => '@codeception/common/unit/fixtures/data/models/user.php'
             ],
         ];
     }

apps/advanced/console/tests/_bootstrap.php → apps/advanced/tests/codeception/console/_bootstrap.php

@@ -4,11 +4,13 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 defined('YII_ENV') or define('YII_ENV', 'test');
 
-require_once(__DIR__ . '/../../vendor/autoload.php');
+defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__))));
 
-require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
-
-require(__DIR__ . '/../../common/config/aliases.php');
+require_once(ROOT_DIR . '/vendor/autoload.php');
+require_once(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
+require(ROOT_DIR . '/common/config/aliases.php');
 
 // set correct script paths
 $_SERVER['SERVER_NAME'] = 'localhost';
+
+Yii::setAlias('@codeception', dirname(__DIR__));
\ No newline at end of file

apps/advanced/tests/codeception/console/codeception.yml

+namespace: codeception_console
+actor: Tester
+paths:
+    tests: .
+    log: _log
+    data: _data
+    helpers: _helpers
+settings:
+    bootstrap: _bootstrap.php
+    suite_class: \PHPUnit_Framework_TestSuite
+    colors: true
+    memory_limit: 1024M
+    log: true

apps/advanced/frontend/tests/_bootstrap.php → apps/advanced/tests/codeception/frontend/_bootstrap.php

@@ -4,15 +4,17 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 defined('YII_ENV') or define('YII_ENV', 'test');
 
-require_once(__DIR__ . '/../../vendor/autoload.php');
+defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__))));
 
-require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
-
-require(__DIR__ . '/../../common/config/aliases.php');
+require_once(ROOT_DIR . '/vendor/autoload.php');
+require_once(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
+require(ROOT_DIR . '/common/config/aliases.php');
 
 // set correct script paths
 
 // the entry script file path for functional and acceptance tests
-$_SERVER['SCRIPT_FILENAME'] = dirname(__DIR__) . '/web/index-test.php';
+$_SERVER['SCRIPT_FILENAME'] = ROOT_DIR . '/frontend/web/index-test.php';
 $_SERVER['SCRIPT_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url'];
 $_SERVER['SERVER_NAME'] = 'localhost';
+
+Yii::setAlias('@codeception', dirname(__DIR__));
\ No newline at end of file

apps/advanced/frontend/tests/_pages/AboutPage.php → apps/advanced/tests/codeception/frontend/_pages/AboutPage.php

 <?php
 
-namespace frontend\tests\_pages;
+namespace codeception\frontend\_pages;
 
 use yii\codeception\BasePage;
 

apps/advanced/frontend/tests/_pages/ContactPage.php → apps/advanced/tests/codeception/frontend/_pages/ContactPage.php

 <?php
 
-namespace frontend\tests\_pages;
+namespace codeception\frontend\_pages;
 
 use yii\codeception\BasePage;
 

apps/advanced/frontend/tests/_pages/SignupPage.php → apps/advanced/tests/codeception/frontend/_pages/SignupPage.php

 <?php
 
-namespace frontend\tests\_pages;
+namespace codeception\frontend\_pages;
 
 use \yii\codeception\BasePage;
 

apps/advanced/frontend/tests/acceptance.suite.yml → apps/advanced/tests/codeception/frontend/acceptance.suite.yml

@@ -12,7 +12,7 @@ class_name: WebGuy
 modules:
     enabled:
         - PhpBrowser
-        - common\tests\_helpers\FixtureHelper
+        - codeception\common\_helpers\FixtureHelper
 # you can use WebDriver instead of PhpBrowser to test javascript and ajax.
 # This will require you to install selenium. See http://codeception.com/docs/04-AcceptanceTests#Selenium
 # "restart" option is used by the WebDriver to start each time per test-file new session and cookies,

apps/advanced/frontend/tests/acceptance/AboutCept.php → apps/advanced/tests/codeception/frontend/acceptance/AboutCept.php

 <?php
-
-use frontend\tests\_pages\AboutPage;
-use frontend\WebGuy;
+use codeception_frontend\WebGuy;
+use codeception\frontend\_pages\AboutPage;
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure that about works');

apps/advanced/frontend/tests/acceptance/ContactCept.php → apps/advanced/tests/codeception/frontend/acceptance/ContactCept.php

 <?php
-
-use frontend\tests\_pages\ContactPage;
-use frontend\WebGuy;
+use codeception_frontend\WebGuy;
+use codeception\frontend\_pages\ContactPage;
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure that contact works');

apps/advanced/frontend/tests/acceptance/HomeCept.php → apps/advanced/tests/codeception/frontend/acceptance/HomeCept.php

 <?php
-
-use frontend\WebGuy;
+use codeception_frontend\WebGuy;
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure that home page works');

apps/advanced/frontend/tests/acceptance/LoginCept.php → apps/advanced/tests/codeception/frontend/acceptance/LoginCept.php

 <?php
-
-use common\tests\_pages\LoginPage;
-use frontend\WebGuy;
+use codeception_frontend\WebGuy;
+use codeception\common\_pages\LoginPage;
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure login page works');

apps/advanced/frontend/tests/acceptance/SignupCest.php → apps/advanced/tests/codeception/frontend/acceptance/SignupCest.php

 <?php
 
-namespace frontend\tests\acceptance;
+namespace codeception\frontend\acceptance;
 
-use frontend\tests\_pages\SignupPage;
+use codeception\frontend\_pages\SignupPage;
 use common\models\User;
 
 class SignupCest