Merge pull request #4723 from yiisoft/codeception-test-adjustments

.travis.yml

@@ -27,12 +27,17 @@ addons:
 
 install:
   - composer self-update && composer --version
+  - export PATH="$HOME/.composer/vendor/bin:$PATH"
 # core framework:
   - composer install --prefer-dist
   - tests/unit/data/travis/mongodb-setup.sh
   - tests/unit/data/travis/apc-setup.sh
   - tests/unit/data/travis/memcache-setup.sh
   - tests/unit/data/travis/cubrid-setup.sh
+# codeception
+  - composer global require "codeception/codeception=2.0.*"
+  - composer global require "codeception/specify=*"
+  - composer global require "codeception/verify=*"
 # basic and advanced application:
   - tests/unit/data/travis/setup-apps.sh
 
@@ -51,10 +56,21 @@ script:
     if (php --version | grep -i HipHop > /dev/null); then
       echo "skipping application tests on HHVM"
     else
-      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/web
+      php -S localhost:8080 > /dev/null 2>&1 &
+      PHP_PID=$!
+      cd ../tests
+      codecept run
+      BASIC_EXIT=$?
+      kill -9 $PHP_PID
+      cd ../../advanced
+      php -S localhost:8080 > /dev/null 2>&1 &
+      PHP_PID=$!
+      cd tests
+      codecept run
+      ADVANCED_EXIT=$?
+      kill -9 $PHP_PID
+      exit $BASIC_EXIT && $ADVANCED_EXIT
     fi
 
 after_script:

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/.gitignore

-# these files are auto generated by codeception build
-/unit/CodeGuy.php
-/functional/TestGuy.php
-/acceptance/WebGuy.php

apps/advanced/backend/tests/_bootstrap.php

-<?php
-
-defined('YII_DEBUG') or define('YII_DEBUG', true);
-
-defined('YII_ENV') or define('YII_ENV', 'test');
-
-require_once(__DIR__ . '/../../vendor/autoload.php');
-
-require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
-
-require(__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_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url'];
-$_SERVER['SERVER_NAME'] = 'localhost';

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

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

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

-<?php
-
-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(__DIR__ . '/../_config.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_acceptance',
-            ],
-        ],
-    ]
-);

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/functional/_config.php

-<?php
-
-// set correct script paths
-$_SERVER['SCRIPT_FILENAME'] = dirname(dirname(__DIR__)) . '/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(__DIR__ . '/../_config.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_functional',
-            ],
-        ],
-    ]
-);

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/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/backend/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' => '@backend/tests/unit/fixtures/data',
-                'templatePath' => '@commmon/tests/templates/fixtures'
-            ],
-        ],
-    ]
-);

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/.gitignore

-# these files are auto generated by codeception build
-/unit/CodeGuy.php
-/functional/TestGuy.php
-/acceptance/WebGuy.php

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/_config.php

-<?php
-
-return yii\helpers\ArrayHelper::merge(
-    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',
-            ],
-        ],
-        'id' => 'app-common',
-        'basePath' => dirname(__DIR__),
-    ]
-);

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/_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/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/.gitignore

-# these files are auto generated by codeception build
-/unit/CodeGuy.php
-/functional/TestGuy.php
-/acceptance/WebGuy.php

apps/advanced/frontend/tests/_bootstrap.php

-<?php
-
-defined('YII_DEBUG') or define('YII_DEBUG', true);
-
-defined('YII_ENV') or define('YII_ENV', 'test');
-
-require_once(__DIR__ . '/../../vendor/autoload.php');
-
-require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
-
-require(__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_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url'];
-$_SERVER['SERVER_NAME'] = 'localhost';

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/_config.php

-<?php
-
-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(__DIR__ . '/../_config.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_acceptance',
-            ],
-        ],
-    ]
-);

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/_config.php

-<?php
-
-// set correct script paths
-$_SERVER['SCRIPT_FILENAME'] = dirname(dirname(__DIR__)) . '/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(__DIR__ . '/../_config.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_functional',
-            ],
-        ],
-    ]
-);

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/init.bat

@@ -5,7 +5,7 @@ rem  Yii command line init 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  @copyright Copyright (c) 2008 Yii Software LLC
 rem  @license http://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 

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/_output
+
+settings:
+  colors: true

apps/advanced/tests/codeception/backend/.gitignore

+# these files are auto generated by codeception build
+/unit/UnitTester.php
+/functional/FunctionalTester.php
+/acceptance/AcceptanceTester.php

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

+<?php
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_ENV') or define('YII_ENV', 'test');
+
+defined('YII_ROOT_DIR') or define('YII_ROOT_DIR', dirname(dirname(dirname(__DIR__))));
+
+defined('YII_BACKEND_TEST_ENTRY_URL') or define('YII_BACKEND_TEST_ENTRY_URL', \Codeception\Configuration::config()['config']['test_entry_url']);
+defined('YII_TEST_BACKEND_ENTRY_FILE') or define('YII_TEST_BACKEND_ENTRY_FILE', YII_ROOT_DIR . '/backend/web/index-test.php');
+
+require_once(YII_ROOT_DIR . '/vendor/autoload.php');
+require_once(YII_ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
+require(YII_ROOT_DIR . '/common/config/aliases.php');
+
+// set correct script paths
+
+// the entry script file path for functional and acceptance tests
+$_SERVER['SCRIPT_FILENAME'] = YII_TEST_BACKEND_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = YII_BACKEND_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

@@ -8,11 +8,11 @@
 
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 
-class_name: WebGuy
+class_name: AcceptanceTester
 modules:
     enabled:
         - PhpBrowser
-        - common\tests\_helpers\FixtureHelper
+        - codeception\common\_support\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\AcceptanceTester;
+use codeception\common\_pages\LoginPage;
 
-$I = new WebGuy($scenario);
+$I = new AcceptanceTester($scenario);
 $I->wantTo('ensure login page works');
 
 $loginPage = LoginPage::openBy($I);

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

+<?php
+new yii\web\Application(require(dirname(dirname(__DIR__)) . '/config/backend/acceptance.php'));

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

+namespace: codeception_backend
+actor: Tester
+paths:
+    tests: .
+    log: _output
+    data: _data
+    helpers: _support
+settings:
+    bootstrap: _bootstrap.php
+    suite_class: \PHPUnit_Framework_TestSuite
+    colors: true
+    memory_limit: 1024M
+    log: true
+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: /backend/web/index-test.php

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

@@ -6,12 +6,12 @@
 
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 #basic/web/index.php
-class_name: TestGuy
+class_name: FunctionalTester
 modules:
     enabled:
       - Filesystem
       - Yii2
-      - common\tests\_helpers\FixtureHelper
+      - codeception\common\_support\FixtureHelper
     config:
         Yii2:
-            configFile: 'tests/functional/_config.php'
+            configFile: '../config/backend/functional.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\FunctionalTester;
+use codeception\common\_pages\LoginPage;
 
-$I = new TestGuy($scenario);
+$I = new FunctionalTester($scenario);
 $I->wantTo('ensure login page works');
 
 $loginPage = LoginPage::openBy($I);

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

+<?php
+new yii\web\Application(require(dirname(dirname(__DIR__)) . '/config/backend/functional.php'));

apps/advanced/backend/tests/unit.suite.yml → 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

apps/advanced/backend/tests/unit/DbTestCase.php → apps/advanced/tests/codeception/backend/unit/DbTestCase.php

@@ -4,5 +4,5 @@ namespace backend\tests\unit;
 
 class DbTestCase extends \yii\codeception\DbTestCase
 {
-    public $appConfig = '@backend/tests/unit/_config.php';
+    public $appConfig = '@codeception/config/backend/unit.php';
 }

apps/advanced/backend/tests/unit/TestCase.php → apps/advanced/tests/codeception/backend/unit/TestCase.php

@@ -4,5 +4,5 @@ namespace backend\tests\unit;
 
 class TestCase extends \yii\codeception\TestCase
 {
-    public $appConfig = '@backend/tests/unit/_config.php';
+    public $appConfig = '@codeception/config/backend/unit.php';
 }

apps/advanced/backend/tests/_console.php → apps/advanced/tests/codeception/bin/_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('YII_ROOT_DIR') or define('YII_ROOT_DIR', dirname(dirname(dirname(__DIR__))));
+
+require_once(YII_ROOT_DIR . '/vendor/autoload.php');
+require_once(YII_ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
+require_once(YII_ROOT_DIR . '/common/config/aliases.php');
 
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 defined('YII_ENV') or define('YII_ENV', 'test');

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

@@ -8,13 +8,24 @@
  * @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__ . '/_bootstrap.php';
 
-require_once(__DIR__ . '/../_console.php');
-
-$config = require(__DIR__ . '/_console.php');
+$config = yii\helpers\ArrayHelper::merge(
+    require(YII_ROOT_DIR . '/common/config/main.php'),
+    require(YII_ROOT_DIR . '/common/config/main-local.php'),
+    require(YII_ROOT_DIR . '/console/config/main.php'),
+    require(YII_ROOT_DIR . '/console/config/main-local.php'),
+    require(dirname(__DIR__) . '/config/acceptance.php'),
+    [
+        'controllerMap' => [
+            'fixture' => [
+                'class' => 'yii\faker\FixtureController',
+                'fixtureDataPath' => dirname(__DIR__) . 'common/fixtures',
+                'templatePath' => dirname(__DIR__) . 'common/templates'
+            ],
+        ],
+    ]
+);
 
 $application = new yii\console\Application($config);
 $exitCode = $application->run();

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

@@ -5,7 +5,7 @@ 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  @copyright Copyright (c) 2008 Yii Software LLC
 rem  @license http://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 
@@ -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/backend/tests/functional/yii → apps/advanced/tests/codeception/bin/yii_functional

@@ -8,13 +8,24 @@
  * @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__ . '/_bootstrap.php';
 
-require_once(__DIR__ . '/../_console.php');
-
-$config = require(__DIR__ . '/_console.php');
+$config = yii\helpers\ArrayHelper::merge(
+    require(YII_ROOT_DIR . '/common/config/main.php'),
+    require(YII_ROOT_DIR . '/common/config/main-local.php'),
+    require(YII_ROOT_DIR . '/console/config/main.php'),
+    require(YII_ROOT_DIR . '/console/config/main-local.php'),
+    require(dirname(__DIR__) . '/config/functional.php'),
+    [
+        'controllerMap' => [
+            'fixture' => [
+                'class' => 'yii\faker\FixtureController',
+                'fixtureDataPath' => dirname(__DIR__) . 'common/fixtures',
+                'templatePath' => dirname(__DIR__) . 'common/templates'
+            ],
+        ],
+    ]
+);
 
 $application = new yii\console\Application($config);
 $exitCode = $application->run();

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

@@ -5,7 +5,7 @@ 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  @copyright Copyright (c) 2008 Yii Software LLC
 rem  @license http://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 
@@ -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/yii → apps/advanced/tests/codeception/bin/yii_unit

@@ -8,13 +8,24 @@
  * @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__ . '/_bootstrap.php';
 
-require_once(__DIR__ . '/../_console.php');
-
-$config = require(__DIR__ . '/_console.php');
+$config = yii\helpers\ArrayHelper::merge(
+    require(YII_ROOT_DIR . '/common/config/main.php'),
+    require(YII_ROOT_DIR . '/common/config/main-local.php'),
+    require(YII_ROOT_DIR . '/console/config/main.php'),
+    require(YII_ROOT_DIR . '/console/config/main-local.php'),
+    require(dirname(__DIR__) . '/config/unit.php'),
+    [
+        'controllerMap' => [
+            'fixture' => [
+                'class' => 'yii\faker\FixtureController',
+                'fixtureDataPath' => dirname(__DIR__) . 'common/fixtures',
+                'templatePath' => dirname(__DIR__) . 'common/templates'
+            ],
+        ],
+    ]
+);
 
 $application = new yii\console\Application($config);
 $exitCode = $application->run();

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

@@ -5,7 +5,7 @@ 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  @copyright Copyright (c) 2008 Yii Software LLC
 rem  @license http://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 
@@ -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/tests/codeception/common/.gitignore

+# these files are auto generated by codeception build
+/unit/UnitTester.php
+/functional/FunctionalTester.php
+/acceptance/AcceptanceTester.php

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

+<?php
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_ENV') or define('YII_ENV', 'test');
+
+defined('YII_ROOT_DIR') or define('YII_ROOT_DIR', dirname(dirname(dirname(__DIR__))));
+
+require_once(YII_ROOT_DIR . '/vendor/autoload.php');
+require_once(YII_ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
+require(YII_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/basic/tests/_pages/LoginPage.php → apps/advanced/tests/codeception/common/_pages/LoginPage.php

 <?php
 
-namespace tests\_pages;
+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');
     }
 }

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

 <?php
 
-namespace common\tests\_helpers;
+namespace codeception\common\_support;
 
+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.
@@ -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;
@@ -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/basic/codeception.yml → apps/advanced/tests/codeception/common/codeception.yml

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

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;
 
+/**
+ * User fixture
+ */
 class UserFixture extends ActiveFixture
 {
     public $modelClass = 'common\models\User';

apps/advanced/common/tests/unit.suite.yml → 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

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

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

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

@@ -2,7 +2,10 @@
 
 namespace common\tests\unit;
 
+/**
+ * @inheritdoc
+ */
 class TestCase extends \yii\codeception\TestCase
 {
-    public $appConfig = '@common/tests/unit/_config.php';
+    public $appConfig = '@codeception/config/common/unit.php';
 }

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;
 
+/**
+ * Login form test
+ */
 class LoginFormTest extends DbTestCase
 {
 
@@ -75,12 +78,15 @@ class LoginFormTest extends DbTestCase
         });
     }
 
+    /**
+     * @inheritdoc
+     */
     public function fixtures()
     {
         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/frontend/tests/_config.php → apps/advanced/tests/codeception/config/acceptance.php

 <?php
 /**
- * application configurations shared by all test types
+ * Application configuration shared by all applications acceptance tests
  */
 return [
     'components' => [
-        'mailer' => [
-            'useFileTransport' => true,
-        ],
-        'urlManager' => [
-            'showScriptName' => true,
+        'db' => [
+            'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_acceptance',
         ],
     ],
 ];
\ No newline at end of file

apps/advanced/tests/codeception/config/backend/acceptance.php

+<?php
+defined('YII_ROOT_DIR') or define('YII_ROOT_DIR', dirname(dirname(dirname(dirname(__DIR__)))));
+return yii\helpers\ArrayHelper::merge(
+    require(YII_ROOT_DIR . '/common/config/main.php'),
+    require(YII_ROOT_DIR . '/common/config/main-local.php'),
+    require(YII_ROOT_DIR . '/backend/config/main.php'),
+    require(YII_ROOT_DIR . '/backend/config/main-local.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/acceptance.php'),
+    require(__DIR__ . '/config.php'),
+    [
+    ]
+);

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

 <?php
-
-new yii\web\Application(require(__DIR__ . '/_config.php'));
+return [];
\ No newline at end of file

apps/advanced/tests/codeception/config/backend/functional.php

+<?php
+$_SERVER['SCRIPT_FILENAME'] = YII_TEST_BACKEND_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = YII_BACKEND_TEST_ENTRY_URL;
+
+return yii\helpers\ArrayHelper::merge(
+    require(YII_ROOT_DIR . '/backend/config/main.php'),
+    require(YII_ROOT_DIR . '/backend/config/main-local.php'),
+    require(YII_ROOT_DIR . '/common/config/main.php'),
+    require(YII_ROOT_DIR . '/common/config/main-local.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/functional.php'),
+    require(__DIR__ . '/config.php'),
+    [
+    ]
+);

apps/advanced/tests/codeception/config/backend/unit.php

+<?php
+
+return yii\helpers\ArrayHelper::merge(
+    require(YII_ROOT_DIR . '/common/config/main.php'),
+    require(YII_ROOT_DIR . '/common/config/main-local.php'),
+    require(YII_ROOT_DIR . '/backend/config/main.php'),
+    require(YII_ROOT_DIR . '/backend/config/main-local.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/unit.php'),
+    require(__DIR__ . '/config.php'),
+    [
+    ]
+);

apps/advanced/tests/codeception/config/common/unit.php

+<?php
+/**
+ * Application config for common unit tests
+ */
+return yii\helpers\ArrayHelper::merge(
+    require(YII_ROOT_DIR . '/common/config/main.php'),
+    require(YII_ROOT_DIR . '/common/config/main-local.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/unit.php'),
+    [
+        'id' => 'app-common',
+        'basePath' => dirname(__DIR__),
+    ]
+);

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

 <?php
 /**
- * application configurations shared by all test types
+ * Application configuration shared by all applications and test types
  */
 return [
     'components' => [

apps/advanced/tests/codeception/config/console/unit.php

+<?php
+
+return yii\helpers\ArrayHelper::merge(
+    require(YII_ROOT_DIR . '/common/config/main.php'),
+    require(YII_ROOT_DIR . '/common/config/main-local.php'),
+    require(YII_ROOT_DIR . '/console/config/main.php'),
+    require(YII_ROOT_DIR . '/console/config/main-local.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/unit.php'),
+    [
+    ]
+);

apps/advanced/tests/codeception/config/frontend/acceptance.php

+<?php
+defined('YII_ROOT_DIR') or define('YII_ROOT_DIR', dirname(dirname(dirname(dirname(__DIR__)))));
+return yii\helpers\ArrayHelper::merge(
+    require(YII_ROOT_DIR . '/common/config/main.php'),
+    require(YII_ROOT_DIR . '/common/config/main-local.php'),
+    require(YII_ROOT_DIR . '/frontend/config/main.php'),
+    require(YII_ROOT_DIR . '/frontend/config/main-local.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/acceptance.php'),
+    require(__DIR__ . '/config.php'),
+    [
+    ]
+);

apps/advanced/backend/tests/functional/_bootstrap.php → apps/advanced/tests/codeception/config/frontend/config.php

 <?php
-
-new yii\web\Application(require(__DIR__ . '/_config.php'));
+return [];
\ No newline at end of file

apps/advanced/tests/codeception/config/frontend/functional.php

+<?php
+$_SERVER['SCRIPT_FILENAME'] = FRONTEND_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = FRONTEND_ENTRY_URL;
+
+return yii\helpers\ArrayHelper::merge(
+    require(YII_ROOT_DIR . '/common/config/main.php'),
+    require(YII_ROOT_DIR . '/common/config/main-local.php'),
+    require(YII_ROOT_DIR . '/frontend/config/main.php'),
+    require(YII_ROOT_DIR . '/frontend/config/main-local.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/functional.php'),
+    require(__DIR__ . '/config.php'),
+    [
+    ]
+);

apps/advanced/tests/codeception/config/frontend/unit.php

+<?php
+
+return yii\helpers\ArrayHelper::merge(
+    require(YII_ROOT_DIR . '/common/config/main.php'),
+    require(YII_ROOT_DIR . '/common/config/main-local.php'),
+    require(YII_ROOT_DIR . '/frontend/config/main.php'),
+    require(YII_ROOT_DIR . '/frontend/config/main-local.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/unit.php'),
+    require(__DIR__ . '/config.php'),
+    [
+    ]
+);

apps/basic/tests/_config.php → apps/advanced/tests/codeception/config/functional.php

 <?php
 /**
- * application configurations shared by all test types
+ * Application configuration shared by all applications functional tests
  */
 return [
     'components' => [
-        'mailer' => [
-            'useFileTransport' => true,
-        ],
-        'urlManager' => [
-            'showScriptName' => true,
+        'db' => [
+            'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_acceptance',
         ],
     ],
 ];
\ No newline at end of file

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

 <?php
 /**
- * application configurations shared by all test types
+ * Application configuration shared by all applications unit tests
  */
 return [
     'components' => [
-        'mailer' => [
-            'useFileTransport' => true,
-        ],
-        'urlManager' => [
-            'showScriptName' => true,
+        'db' => [
+            'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_unit',
         ],
     ],
 ];
\ No newline at end of file

apps/advanced/console/tests/.gitignore → apps/advanced/tests/codeception/console/.gitignore

 # these files are auto generated by codeception build
-/unit/CodeGuy.php
+/unit/UnitTester.php

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

 <?php
-
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-
 defined('YII_ENV') or define('YII_ENV', 'test');
 
-require_once(__DIR__ . '/../../vendor/autoload.php');
+defined('YII_ROOT_DIR') or define('YII_ROOT_DIR', dirname(dirname(dirname(__DIR__))));
 
-require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
-
-require(__DIR__ . '/../../common/config/aliases.php');
+require_once(YII_ROOT_DIR . '/vendor/autoload.php');
+require_once(YII_ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
+require(YII_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: _output
+    data: _data
+    helpers: _support
+settings:
+    bootstrap: _bootstrap.php
+    suite_class: \PHPUnit_Framework_TestSuite
+    colors: true
+    memory_limit: 1024M
+    log: true

apps/advanced/console/tests/unit.suite.yml → 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

apps/advanced/console/tests/unit/DbTestCase.php → apps/advanced/tests/codeception/console/unit/DbTestCase.php

@@ -2,7 +2,10 @@
 
 namespace console\tests\unit;
 
+/**
+ * @inheritdoc
+ */
 class DbTestCase extends \yii\codeception\DbTestCase
 {
-    public $appConfig = '@console/tests/unit/_config.php';
+    public $appConfig = '@codeception/config/console/config.php';
 }

apps/advanced/console/tests/unit/TestCase.php → apps/advanced/tests/codeception/console/unit/TestCase.php

@@ -2,7 +2,10 @@
 
 namespace console\tests\unit;
 
+/**
+ * @inheritdoc
+ */
 class TestCase extends \yii\codeception\TestCase
 {
-    public $appConfig = '@console/tests/unit/_config.php';
+    public $appConfig = '@codeception/config/console/config.php';
 }

apps/advanced/tests/codeception/frontend/.gitignore

+# these files are auto generated by codeception build
+/unit/UnitTester.php
+/functional/FunctionalTester.php
+/acceptance/AcceptanceTester.php

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

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

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

 <?php
 
-namespace tests\_pages;
+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';

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

 <?php
 
-namespace tests\_pages;
+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');
     }
 }

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;
 
+/**
+ * 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');
     }
 }

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

@@ -8,11 +8,11 @@
 
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 
-class_name: WebGuy
+class_name: AcceptanceTester
 modules:
     enabled:
         - PhpBrowser
-        - common\tests\_helpers\FixtureHelper
+        - codeception\common\_support\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 codeception_frontend\AcceptanceTester;
+use codeception\frontend\_pages\AboutPage;
 
-use frontend\tests\_pages\AboutPage;
-use frontend\WebGuy;
-
-$I = new WebGuy($scenario);
+$I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that about works');
 AboutPage::openBy($I);
 $I->see('About', 'h1');

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

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

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

 <?php
+use codeception_frontend\AcceptanceTester;
 
-use frontend\WebGuy;
-
-$I = new WebGuy($scenario);
+$I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that home page works');
 $I->amOnPage(Yii::$app->homeUrl);
 $I->see('My Company');

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

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

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
@@ -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)

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

+<?php
+new yii\web\Application(require(dirname(dirname(__DIR__)) . '/config/frontend/acceptance.php'));

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

-namespace: frontend
+namespace: codeception_frontend
 actor: Tester
 paths:
-    tests: tests
-    log: tests/_log
-    data: tests/_data
-    helpers: tests/_helpers
+    tests: .
+    log: _output
+    data: _data
+    helpers: _support
 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/frontend/web/index-test.php
+    test_entry_url: /frontend/web/index-test.php

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

@@ -6,12 +6,12 @@
 
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 #basic/web/index.php
-class_name: TestGuy
+class_name: FunctionalTester
 modules:
     enabled:
       - Filesystem
       - Yii2
-      - common\tests\_helpers\FixtureHelper
+      - codeception\common\_support\FixtureHelper
     config:
         Yii2:
-            configFile: 'tests/functional/_config.php'
+            configFile: '../config/frontend/functional.php'

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

 <?php
+use codeception_frontend\FunctionalTester;
+use codeception\frontend\_pages\AboutPage;
 
-use frontend\tests\_pages\AboutPage;
-use frontend\TestGuy;
-
-$I = new TestGuy($scenario);
+$I = new FunctionalTester($scenario);
 $I->wantTo('ensure that about works');
 AboutPage::openBy($I);
 $I->see('About', 'h1');

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

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

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

 <?php
-
-use frontend\TestGuy;
-
-$I = new TestGuy($scenario);
+use codeception_frontend\FunctionalTester;
+$I = new FunctionalTester($scenario);
 $I->wantTo('ensure that home page works');
 $I->amOnPage(Yii::$app->homeUrl);
 $I->see('My Company');

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

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

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

 <?php
 
-namespace frontend\tests\functional;
+namespace codeception\frontend\functional;
 
-use frontend\tests\_pages\SignupPage;
+use codeception\frontend\_pages\SignupPage;
 use common\models\User;
 
 class SignupCest
@@ -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)

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

+<?php
+
+new yii\web\Application(require(dirname(dirname(__DIR__)) . '/config/frontend/functional.php'));

apps/advanced/frontend/tests/unit.suite.yml → 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

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

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

apps/advanced/frontend/tests/unit/TestCase.php → apps/advanced/tests/codeception/frontend/unit/TestCase.php

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

apps/advanced/frontend/tests/unit/models/ContactFormTest.php → apps/advanced/tests/codeception/frontend/unit/models/ContactFormTest.php

 <?php
 
-namespace frontend\tests\unit\models;
+namespace codeception\frontend\unit\models;
 
 use Yii;
-use frontend\tests\unit\TestCase;
+use codeception\frontend\unit\TestCase;
 use frontend\models\ContactForm;
 
 class ContactFormTest extends TestCase

apps/advanced/frontend/tests/unit/models/PasswordResetRequestFormTest.php → apps/advanced/tests/codeception/frontend/unit/models/PasswordResetRequestFormTest.php

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

apps/advanced/frontend/tests/unit/models/ResetPasswordFormTest.php → apps/advanced/tests/codeception/frontend/unit/models/ResetPasswordFormTest.php

 <?php
 
-namespace frontend\tests\unit\models;
+namespace codeception\frontend\unit\models;
 
-use frontend\tests\unit\DbTestCase;
-use common\tests\fixtures\UserFixture;
+use codeception\frontend\unit\DbTestCase;
+use codeception\common\fixtures\UserFixture;
 use frontend\models\ResetPasswordForm;
 
 class ResetPasswordFormTest extends DbTestCase
 {
 
     /**
-     * @expectedException yii\base\InvalidParamException
+     * @expectedException \yii\base\InvalidParamException
      */
     public function testResetWrongToken()
     {
@@ -18,7 +18,7 @@ class ResetPasswordFormTest extends DbTestCase
     }
 
     /**
-     * @expectedException yii\base\InvalidParamException
+     * @expectedException \yii\base\InvalidParamException
      */
     public function testResetEmptyToken()
     {
@@ -36,7 +36,7 @@ class ResetPasswordFormTest extends DbTestCase
         return [
             'user' => [
                 'class' => UserFixture::className(),
-                'dataFile' => '@frontend/tests/unit/fixtures/data/models/user.php'
+                'dataFile' => '@codeception/frontend/unit/fixtures/data/models/user.php'
             ],
         ];
     }

apps/advanced/frontend/tests/unit/models/SignupFormTest.php → apps/advanced/tests/codeception/frontend/unit/models/SignupFormTest.php

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

apps/advanced/yii.bat

@@ -5,7 +5,7 @@ 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  @copyright Copyright (c) 2008 Yii Software LLC
 rem  @license http://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 

apps/basic/composer.json

@@ -24,11 +24,6 @@
         "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"
-    },
     "scripts": {
         "post-create-project-cmd": [
             "yii\\composer\\Installer::setPermission",

apps/basic/config/web.php

@@ -9,7 +9,7 @@ $config = [
     'components' => [
         'request' => [
             // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation
-            'cookieValidationKey' => '',
+            'cookieValidationKey' => 'thisIsAKey',
         ],
         'cache' => [
             'class' => 'yii\caching\FileCache',
@@ -38,6 +38,10 @@ $config = [
             ],
         ],
         'db' => require(__DIR__ . '/db.php'),
+        'urlManager' => [
+            'enablePrettyUrl' => true,
+            'showScriptName' => false,
+        ],
     ],
     'params' => $params,
 ];

apps/basic/tests/.gitignore

-# these files are auto generated by codeception build
-/unit/CodeGuy.php
-/functional/TestGuy.php
-/acceptance/WebGuy.php

apps/basic/tests/README.md

-This folder contains various tests for the basic application.
-These tests are developed with [Codeception PHP Testing Framework](http://codeception.com/).
+This directory contains various tests for the basic application.
+
+Tests in `codeception` directory are developed with [Codeception PHP Testing Framework](http://codeception.com/).
 
 After creating the basic application, follow these steps to prepare for the tests:
 
-1. Install additional composer packages:
+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>
+```
 
-   ```
-   php composer.phar require --dev "codeception/codeception: 2.0.*" "codeception/specify: *" "codeception/verify: *"
-   ```
-2. In the file `_bootstrap.php`, modify the definition of the constant `TEST_ENTRY_URL` so
-   that it points to the correct entry script URL.
-3. Go to the application base directory and build the test suites:
+Then add `<directory>/vendor/bin` to you `PATH` environment variable. Now we're able to use `codecept` from command
+line globally.
 
-   ```
-   vendor/bin/codecept build
-   ```
+2. Build the test suites:
+
+```
+codecept build
+```
+
+3. 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 `web` directory execute the following:
+
+```
+php -S localhost:8080
+```
 
-Now you can run the tests with the following commands:
+4. Now you can run the tests with the following commands:
 
 ```
 # run all available tests
-vendor/bin/codecept run
+codecept run
 # run acceptance tests
-vendor/bin/codecept run acceptance
+codecept run acceptance
 # run functional tests
-vendor/bin/codecept run functional
+codecept run functional
 # run unit tests
-vendor/bin/codecept run unit
+codecept run unit
 ```
 
 Please refer to [Codeception tutorial](http://codeception.com/docs/01-Introduction) for

apps/basic/tests/_bootstrap.php

-<?php
-
-// the entry script URL (without host info) for functional and acceptance tests
-// PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
-defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', '/basic/web/index-test.php');
-
-// the entry script file path for functional and acceptance tests
-defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(__DIR__) . '/web/index-test.php');
-
-defined('YII_DEBUG') or define('YII_DEBUG', true);
-
-defined('YII_ENV') or define('YII_ENV', 'test');
-
-require_once(__DIR__ . '/../vendor/autoload.php');
-
-require_once(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
-
-// set correct script paths
-$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
-$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
-$_SERVER['SERVER_NAME'] = 'localhost';
-
-Yii::setAlias('@tests', __DIR__);

apps/basic/tests/_data/dump.sql

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

apps/basic/tests/acceptance/_bootstrap.php

-<?php
-
-new yii\web\Application(require(__DIR__ . '/_config.php'));

apps/basic/tests/acceptance/_console.php

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

apps/basic/tests/acceptance/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/backend/codeception.yml → apps/basic/tests/codeception.yml

-namespace: backend
 actor: Tester
 paths:
-    tests: tests
-    log: tests/_log
-    data: tests/_data
-    helpers: tests/_helpers
+    tests: codeception
+    log: codeception/_output
+    data: codeception/_data
+    helpers: codeception/_support
 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
+    colors: true
 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: /index-test.php
\ No newline at end of file

apps/basic/tests/codeception/.gitignore

+# these files are auto generated by codeception build
+/unit/UnitTester.php
+/functional/FunctionalTester.php
+/acceptance/AcceptanceTester.php

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

 <?php
-
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-
 defined('YII_ENV') or define('YII_ENV', 'test');
 
-require_once(__DIR__ . '/../../vendor/autoload.php');
+defined('YII_TEST_ENTRY_URL') or define('YII_TEST_ENTRY_URL', \Codeception\Configuration::config()['config']['test_entry_url']);
+defined('YII_TEST_ENTRY_FILE') or define('YII_TEST_ENTRY_FILE', dirname(dirname(__DIR__)) . '/web/index-test.php');
 
+require_once(__DIR__ . '/../../vendor/autoload.php');
 require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
 
-require(__DIR__ . '/../../common/config/aliases.php');
-
-// set correct script paths
+$_SERVER['SCRIPT_FILENAME'] = YII_TEST_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = YII_TEST_ENTRY_URL;
 $_SERVER['SERVER_NAME'] = 'localhost';
+
+Yii::setAlias('@codeception', __DIR__);

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

 <?php
 
-namespace frontend\tests\_pages;
+namespace codeception\_pages;
 
 use yii\codeception\BasePage;
 
+/**
+ * Represents about page
+ * @property \AcceptanceTester|\FunctionalTester $actor
+ */
 class AboutPage extends BasePage
 {
     public $route = 'site/about';

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

 <?php
 
-namespace frontend\tests\_pages;
+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');
     }
 }

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

 <?php
 
-namespace common\tests\_pages;
+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');
     }
 }

apps/basic/tests/acceptance.suite.yml → 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

apps/basic/tests/acceptance/AboutCept.php → apps/basic/tests/codeception/acceptance/AboutCept.php

 <?php
 
-use tests\_pages\AboutPage;
+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');

apps/basic/tests/acceptance/ContactCept.php → apps/basic/tests/codeception/acceptance/ContactCept.php

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

apps/basic/tests/acceptance/HomeCept.php → apps/basic/tests/codeception/acceptance/HomeCept.php

 <?php
 
-$I = new WebGuy($scenario);
+$I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that home page works');
 $I->amOnPage(Yii::$app->homeUrl);
 $I->see('My Company');

apps/basic/tests/acceptance/LoginCept.php → apps/basic/tests/codeception/acceptance/LoginCept.php

 <?php
 
-use tests\_pages\LoginPage;
+use codeception\_pages\LoginPage;
 
-$I = new WebGuy($scenario);
+$I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that login works');
 
 $loginPage = LoginPage::openBy($I);

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

 <?php
-
-new yii\web\Application(require(__DIR__ . '/_config.php'));
+new yii\web\Application(require(dirname(__DIR__) . '/config/acceptance.php'));

apps/basic/tests/_console_bootstrap.php → apps/basic/tests/codeception/bin/_bootstrap.php

 <?php
-
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-
 defined('YII_ENV') or define('YII_ENV', 'test');
 
 // 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(__DIR__ . '/../vendor/autoload.php');
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+defined('YII_ROOT_DIR') or define('YII_ROOT_DIR', dirname(dirname(dirname(__DIR__))));
+
+require(YII_ROOT_DIR . '/vendor/autoload.php');
+require(YII_ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');

apps/basic/tests/acceptance/yii → apps/basic/tests/codeception/bin/yii_acceptance

@@ -8,9 +8,19 @@
  * @license http://www.yiiframework.com/license/
  */
 
-require_once __DIR__ . '/../_console_bootstrap.php';
+require_once __DIR__ . '/_bootstrap.php';
 
-$config = require(__DIR__ . '/_console.php');
+$config = yii\helpers\ArrayHelper::merge(
+    require(YII_ROOT_DIR . '/config/console.php'),
+    require(__DIR__ . '/../config/config.php'),
+    [
+        'components' => [
+            'db' => [
+                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_acceptance',
+            ],
+        ],
+    ]
+);
 
 $application = new yii\console\Application($config);
 $exitCode = $application->run();

apps/advanced/common/tests/unit/yii.bat → apps/basic/tests/codeception/bin/yii_acceptance.bat

@@ -5,7 +5,7 @@ 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  @copyright Copyright (c) 2008 Yii Software LLC
 rem  @license http://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 
@@ -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/basic/tests/functional/yii → apps/basic/tests/codeception/bin/yii_functional

@@ -8,9 +8,19 @@
  * @license http://www.yiiframework.com/license/
  */
 
-require_once __DIR__ . '/../_console_bootstrap.php';
+require_once __DIR__ . '/_bootstrap.php';
 
-$config = require(__DIR__ . '/_console.php');
+$config = yii\helpers\ArrayHelper::merge(
+    require(YII_ROOT_DIR . '/config/console.php'),
+    require(__DIR__ . '/../config/config.php'),
+    [
+        'components' => [
+            'db' => [
+                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional',
+            ],
+        ],
+    ]
+);
 
 $application = new yii\console\Application($config);
 $exitCode = $application->run();

apps/advanced/console/tests/unit/yii.bat → apps/basic/tests/codeception/bin/yii_functional.bat

@@ -5,7 +5,7 @@ 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  @copyright Copyright (c) 2008 Yii Software LLC
 rem  @license http://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 
@@ -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/basic/tests/unit/yii → apps/basic/tests/codeception/bin/yii_unit

@@ -8,9 +8,19 @@
  * @license http://www.yiiframework.com/license/
  */
 
-require_once __DIR__ . '/../_console_bootstrap.php';
+require_once __DIR__ . '/_bootstrap.php';
 
-$config = require(__DIR__ . '/_console.php');
+$config = yii\helpers\ArrayHelper::merge(
+    require(YII_ROOT_DIR . '/config/console.php'),
+    require(__DIR__ . '/../config/config.php'),
+    [
+        'components' => [
+            'db' => [
+                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_unit',
+            ],
+        ],
+    ]
+);
 
 $application = new yii\console\Application($config);
 $exitCode = $application->run();

apps/advanced/frontend/tests/acceptance/yii.bat → apps/basic/tests/codeception/bin/yii_unit.bat

@@ -5,7 +5,7 @@ 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  @copyright Copyright (c) 2008 Yii Software LLC
 rem  @license http://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 
@@ -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/basic/tests/acceptance/_config.php → apps/basic/tests/codeception/config/acceptance.php

 <?php
-
+/**
+ * Application configuration for acceptance tests
+ */
 return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/web.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(__DIR__ . '/../../../config/web.php'),
+    require(__DIR__ . '/config.php'),
     [
         'components' => [
             'db' => [

apps/advanced/common/tests/_config.php → apps/basic/tests/codeception/config/config.php

 <?php
 /**
- * application configurations shared by all test types
+ * Application configuration shared by all test types
  */
 return [
     'components' => [

apps/basic/tests/functional/_console.php → apps/basic/tests/codeception/config/functional.php

 <?php
+$_SERVER['SCRIPT_FILENAME'] = YII_TEST_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = YII_TEST_ENTRY_URL;
 
+/**
+ * Application configuration for functional tests
+ */
 return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/console.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(__DIR__ . '/../../../config/web.php'),
+    require(__DIR__ . '/config.php'),
     [
         'components' => [
             'db' => [

apps/basic/tests/unit/_config.php → apps/basic/tests/codeception/config/unit.php

 <?php
-
+/**
+ * Application configuration for unit tests
+ */
 return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/web.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(__DIR__ . '/../../../config/web.php'),
+    require(__DIR__ . '/config.php'),
     [
         'components' => [
             'db' => [

apps/basic/tests/functional.suite.yml → apps/basic/tests/codeception/functional.suite.yml

@@ -6,11 +6,11 @@
 
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 #basic/web/index.php
-class_name: TestGuy
+class_name: FunctionalTester
 modules:
     enabled:
       - Filesystem
       - Yii2
     config:
         Yii2:
-            configFile: 'tests/functional/_config.php'
+            configFile: 'codeception/config/functional.php'

apps/basic/tests/functional/AboutCept.php → apps/basic/tests/codeception/functional/AboutCept.php

 <?php
 
-use tests\_pages\AboutPage;
+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');

apps/basic/tests/functional/ContactCept.php → apps/basic/tests/codeception/functional/ContactCept.php

 <?php
 
-use tests\_pages\ContactPage;
+use codeception\_pages\ContactPage;
 
-$I = new TestGuy($scenario);
+$I = new FunctionalTester($scenario);
 $I->wantTo('ensure that contact works');
 
 $contactPage = ContactPage::openBy($I);

apps/basic/tests/functional/HomeCept.php → apps/basic/tests/codeception/functional/HomeCept.php

 <?php
 
-$I = new TestGuy($scenario);
+$I = new FunctionalTester($scenario);
 $I->wantTo('ensure that home page works');
 $I->amOnPage(Yii::$app->homeUrl);
 $I->see('My Company');

apps/basic/tests/functional/LoginCept.php → apps/basic/tests/codeception/functional/LoginCept.php

 <?php
 
-use tests\_pages\LoginPage;
+use codeception\_pages\LoginPage;
 
-$I = new TestGuy($scenario);
+$I = new FunctionalTester($scenario);
 $I->wantTo('ensure that login works');
 
 $loginPage = LoginPage::openBy($I);

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

 <?php
-
-new yii\web\Application(require(__DIR__ . '/_config.php'));
+new yii\web\Application(require(dirname(__DIR__) . '/config/functional.php'));

apps/basic/tests/unit.suite.yml → 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

apps/basic/tests/unit/models/ContactFormTest.php → apps/basic/tests/codeception/unit/models/ContactFormTest.php

 <?php
 
-namespace tests\unit\models;
+namespace codeception\unit\models;
 
 use Yii;
 use yii\codeception\TestCase;

apps/basic/tests/unit/models/LoginFormTest.php → apps/basic/tests/codeception/unit/models/LoginFormTest.php

 <?php
 
-namespace tests\unit\models;
+namespace codeception\unit\models;
 
 use Yii;
 use yii\codeception\TestCase;

apps/basic/tests/unit/models/UserTest.php → apps/basic/tests/codeception/unit/models/UserTest.php

 <?php
 
-namespace tests\unit\models;
+namespace codeception\unit\models;
 
 use yii\codeception\TestCase;
 

apps/basic/tests/functional/_bootstrap.php

-<?php
-
-new yii\web\Application(require(__DIR__ . '/_config.php'));

apps/basic/tests/functional/_config.php

-<?php
-
-// set correct script paths
-$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
-$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
-
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/web.php'),
-    require(__DIR__ . '/../_config.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional',
-            ],
-        ],
-    ]
-);

apps/basic/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/basic/tests/unit/_console.php

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

apps/basic/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/basic/web/index-test.php

@@ -11,6 +11,6 @@ defined('YII_ENV') or define('YII_ENV', 'test');
 require(__DIR__ . '/../vendor/autoload.php');
 require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
 
-$config = require(__DIR__ . '/../tests/acceptance/_config.php');
+$config = require(__DIR__ . '/../tests/codeception/config/acceptance.php');
 
 (new yii\web\Application($config))->run();

apps/basic/yii.bat

@@ -5,7 +5,7 @@ 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  @copyright Copyright (c) 2008 Yii Software LLC
 rem  @license http://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 

docs/guide/test-acceptance.md

@@ -4,23 +4,8 @@ Acceptance Tests
 > Note: This section is under development.
 
 - http://codeception.com/docs/04-AcceptanceTests
-- https://github.com/yiisoft/yii2/blob/master/apps/advanced/README.md#testing
-- https://github.com/yiisoft/yii2/blob/master/apps/basic/tests/README.md
 
-How to run webserver
---------------------
+Running basic and advanced template acceptance tests
+----------------------------------------------------
 
-In order to perform acceptance tests you need a web server. Since PHP 5.4 has built-in one, we can use it. For the basic
-application template it would be:
-
-```
-cd web
-php -S localhost:8080
-```
-
-In order for the tests to work correctly you need to adjust `TEST_ENTRY_URL` in `_bootstrap.php` file. It should point
-to `index-test.php` of your webserver. Since we're running directly from its directory the line would be:
-
-```php
-defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', '/index-test.php');
-```
+Please refer to instructions provided in `apps/advanced/tests/README.md` and `apps/basic/tests/README.md`.

docs/guide/test-functional.md

 Functional Tests
-----------------
+================
 
 > Note: This section is under development.
 
 - http://codeception.com/docs/05-FunctionalTests
-- https://github.com/yiisoft/yii2/blob/master/apps/advanced/README.md#testing
-- https://github.com/yiisoft/yii2/blob/master/apps/basic/tests/README.md
+
+Running basic and advanced template functional tests
+----------------------------------------------------
+
+Please refer to instructions provided in `apps/advanced/tests/README.md` and `apps/basic/tests/README.md`.
\ No newline at end of file

docs/guide/test-overview.md

@@ -34,4 +34,11 @@ composer global require "codeception/specify=*"
 composer global require "codeception/verify=*"
 ```
 
-That's it. Now we're able to use `codecept` from command line.
+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.

docs/guide/test-unit.md

@@ -3,11 +3,6 @@ Unit Tests
 
 > Note: This section is under development.
 
-TODO:
-
-- https://github.com/yiisoft/yii2/blob/master/apps/advanced/README.md#testing
-- https://github.com/yiisoft/yii2/blob/master/apps/basic/tests/README.md
-
 A unit test verifies that a single unit of code is working as expected. In object-oriented programming, the most basic
 code unit is a class. A unit test thus mainly needs to verify that each of the class interface methods works properly.
 That is, given different input parameters, the test verifies the method returns expected results.
@@ -17,3 +12,8 @@ Unit testing in Yii is built on top of PHPUnit and, optionally, Codeception so i
 
 - [PHPUnit docs starting from chapter 2](http://phpunit.de/manual/current/en/writing-tests-for-phpunit.html).
 - [Codeception Unit Tests](http://codeception.com/docs/06-UnitTests).
+
+Running basic and advanced template unit tests
+----------------------------------------------
+
+Please refer to instructions provided in `apps/advanced/tests/README.md` and `apps/basic/tests/README.md`.

docs/internals/getting-started.md

@@ -29,57 +29,6 @@ You can now execute unit tests by running `phpunit`.
 You may limit the tests to a group of tests you are working on e.g. to run only tests for the validators and redis
 `phpunit --group=validators,redis`.
 
-Functional and acceptance tests
--------------------------------
-
-In order to run functional and acceptance tests you need to install additional composer packages for the application you're going
-to test. Add the following four packages to your `composer.json` `require-dev` section: 
-
-```
-"yiisoft/yii2-codeception": "*",
-```
-
-For advanced application you may need `yiisoft/yii2-faker: *` as well.
-
-Then for the basic application template run `./build/build app/link basic`. For advanced template command is
-`./build/build app/link advanced`.
-
-After package installation is complete you can run the following for basic app:
-
-```
-cd apps/basic
-codecept build
-codecept run
-```
-
-For advanced application frontend it will be:
-
-```
-cd apps/advanced/frontend
-codecept build
-codecept run
-```
-
-Note that you need a running webserver in order to pass acceptance tests. That can be easily achieved with PHP's built-in
-webserver:
-
-```
-cd apps/advanced/frontend/www
-php -S 127.0.0.1:8080
-```
-
-Note that you should have Codeception and PHPUnit installed globally:
- 
-```
-composer global require "phpunit/phpunit=4.1.*"
-composer global require "codeception/codeception=2.0.*"
-composer global require "codeception/specify=*"
-composer global require "codeception/verify=*"
-```
-
-After running commands you'll see "Changed current directory to /your/global/composer/dir" message. If it's the
-first time you're installing a package globally you need to add `/your/global/composer/dir/vendor/bin/` to your `PATH`.
-
 Extensions
 ----------
 
@@ -89,3 +38,7 @@ Just add them to the `composer.json` as you would normally do e.g. add `"yiisoft
 Running `./build/build app/link basic` will install the extension and its dependecies and create
 a symlink to `extensions/redis` so you are not working the composer vendor dir but the yii2 repo directly.
 
+Functional and acceptance tests for applications
+------------------------------------------------
+
+See `apps/advanced/tests/README.md` and `apps/basic/tests/README.md` to learn about how to run Codeception tests.

extensions/apidoc/apidoc.bat

@@ -5,7 +5,7 @@ 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  @copyright Copyright (c) 2008 Yii Software LLC
 rem  @license http://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 

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
      */

extensions/codeception/DbTestCase.php

@@ -10,6 +10,8 @@ namespace yii\codeception;
 use yii\test\InitDbFixture;
 
 /**
+ * Base class for database test cases
+ *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */

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
 <?php
-$this->codeGuy->someMethodFromModule();
+$this->unitTester->someMethodFromModule();
 ```
 Codeception events
 ------------------

extensions/codeception/TestCase.php

@@ -31,7 +31,7 @@ class TestCase extends Test
      * The application configuration array may contain an optional `class` element which specifies the class
      * name of the application instance to be created. By default, a [[\yii\web\Application]] instance will be created.
      */
-    public $appConfig = '@tests/unit/_config.php';
+    public $appConfig = '@codeception/config/unit.php';
 
 
     /**

framework/yii.bat

@@ -5,7 +5,7 @@ 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  @copyright Copyright (c) 2008 Yii Software LLC
 rem  @license http://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 

tests/unit/data/travis/init-apps.sh

@@ -7,8 +7,9 @@ else
     mysql -e 'CREATE DATABASE yii2_advanced_acceptance;';
     mysql -e 'CREATE DATABASE yii2_advanced_functional;';
     mysql -e 'CREATE DATABASE yii2_advanced_unit;';
-    cd apps/advanced/frontend/tests/acceptance && php yii migrate --interactive=0
-    cd ../functional && php yii migrate --interactive=0
-    cd ../unit && php yii migrate --interactive=0 && cd ../../../../..
-
+    cd apps/advanced/tests/codeception/bin
+    php yii_acceptance migrate --interactive=0
+    php yii_functional migrate --interactive=0
+    php yii_unit migrate --interactive=0
+    cd ../../../../..
 fi

tests/unit/data/travis/setup-apps.sh

@@ -7,24 +7,20 @@ else
     # basic application:
 
     composer install --dev --prefer-dist -d apps/basic
-    cd apps/basic && composer require --dev codeception/codeception:2.0.* codeception/specify:* codeception/verify:*
-    sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" config/web.php
-    php vendor/bin/codecept build && cd ../..
+    cd apps/basic && sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" config/web.php
+    cd tests && codecept build && cd ../../..
 
 
     # advanced application:
 
     composer install --dev --prefer-dist -d apps/advanced
-    cd apps/advanced && composer require --dev codeception/codeception:2.0.* codeception/specify:* codeception/verify:*
-    ./init --env=Development
+    cd apps/advanced && ./init --env=Development
     sed -i s/root/travis/ common/config/main-local.php
     sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" frontend/config/main.php
     sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" backend/config/main.php
-    cd backend && php ../vendor/bin/codecept build
-    cd ../common && php ../vendor/bin/codecept build
-    cd ../frontend && php ../vendor/bin/codecept build && cd ../../..
-
-    # boot server
-    cd apps && php -S localhost:8080 > /dev/null 2>&1 &
-
+    cd tests/codeception/backend && codecept build
+    cd ../common && codecept build
+    cd ../console && codecept build
+    cd ../frontend && codecept build
+    cd ../../../
 fi