Merge branch 'master' of github.com:yiisoft/yii2

.gitignore

@@ -14,6 +14,8 @@ Thumbs.db
 
 # composer vendor dir
 /vendor
+# cubrid install dir
+/cubrid
 
 # composer itself is not needed
 composer.phar

.travis.yml

@@ -7,6 +7,9 @@ php:
   - hhvm
   - hhvm-nightly
 
+env:
+  - CUBRID_VERSION=9.3.0/CUBRID-9.3.0.0206 CUBRID_PDO_VERSION=9.2.0.0001
+
 # run build against hhvm but allow them to fail
 # http://docs.travis-ci.com/user/build-configuration/#Rows-That-are-Allowed-To-Fail
 matrix:
@@ -21,18 +24,30 @@ services:
   - elasticsearch
   - mongodb
 
+# faster builds on new travis setup not using sudo
+sudo: false
+
+# cache vendor dirs
+cache:
+  directories:
+    - cubrid
+    - vendor
+
 # try running against postgres 9.3
 addons:
   postgresql: "9.3"
 
 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.*" "codeception/specify=*" "codeception/verify=*"
 # basic and advanced application:
   - tests/unit/data/travis/setup-apps.sh
 
@@ -47,10 +62,24 @@ before_script:
 
 script:
   - vendor/bin/phpunit --verbose --coverage-clover=coverage.clover --exclude-group mssql,oci,wincache,xcache,zenddata
-  - cd apps/basic && php vendor/bin/codecept run
-  - cd ../advanced/backend && ../vendor/bin/codecept run
-  - cd ../common && ../vendor/bin/codecept run
-  - cd ../frontend && ../vendor/bin/codecept run
+  - |
+    if (php --version | grep -i HipHop > /dev/null); then
+      echo "Skipping basic application tests on HHVM"
+    else
+      cd apps/basic/web
+      php -S localhost:8080 > /dev/null 2>&1 &
+      cd ../tests
+      codecept run
+    fi
+  - |
+    if (php --version | grep -i HipHop > /dev/null); then
+      echo "Skipping advanced application tests on HHVM"
+    else
+      cd apps/advanced
+      php -S localhost:8080 > /dev/null 2>&1 &
+      cd tests
+      codecept run
+    fi
 
 after_script:
   - cd ../../..

apps/advanced/README.md

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

apps/advanced/backend/tests/.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/acceptance/yii

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

apps/advanced/backend/tests/functional/_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/functional/yii

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

apps/advanced/backend/tests/unit/_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/backend/tests/unit/yii

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

apps/advanced/backend/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/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/common/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/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/console/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/environments/dev/backend/web/index-test.php

@@ -12,6 +12,6 @@ require(__DIR__ . '/../../vendor/autoload.php');
 require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
 require(__DIR__ . '/../../common/config/aliases.php');
 
-$config = require(__DIR__ . '/../tests/acceptance/_config.php');
+$config = require(__DIR__ . '/../../tests/codeception/config/backend/acceptance.php');
 
 (new yii\web\Application($config))->run();

apps/advanced/environments/dev/frontend/web/index-test.php

@@ -12,6 +12,6 @@ require(__DIR__ . '/../../vendor/autoload.php');
 require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
 require(__DIR__ . '/../../common/config/aliases.php');
 
-$config = require(__DIR__ . '/../tests/acceptance/_config.php');
+$config = require(__DIR__ . '/../../tests/codeception/config/frontend/acceptance.php');
 
 (new yii\web\Application($config))->run();

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

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

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/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/frontend/tests/functional/_bootstrap.php

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

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.*" "codeception/specify=*" "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 you'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 `yii2_advanced_tests` database then update it by applying migrations:
+
+   ```
+   codeception/bin/yii 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_APP_BASE_PATH') or define('YII_APP_BASE_PATH', 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_APP_BASE_PATH . '/backend/web/index-test.php');
+
+require_once(YII_APP_BASE_PATH . '/vendor/autoload.php');
+require_once(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.php');
+require(YII_APP_BASE_PATH . '/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('@tests', dirname(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
+        - tests\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 tests\codeception\backend\AcceptanceTester;
+use tests\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: tests\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
+      - tests\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 tests\codeception\backend\FunctionalTester;
+use tests\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 = '@tests/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 = '@tests/codeception/config/backend/unit.php';
 }

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

@@ -11,9 +11,13 @@
 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_APP_BASE_PATH') or define('YII_APP_BASE_PATH', dirname(dirname(dirname(__DIR__))));
+
+require_once(YII_APP_BASE_PATH . '/vendor/autoload.php');
+require_once(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.php');
+require_once(YII_APP_BASE_PATH . '/common/config/aliases.php');
 
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 defined('YII_ENV') or define('YII_ENV', 'test');
+
+Yii::setAlias('@tests', dirname(dirname(__DIR__)));
\ No newline at end of file

apps/basic/tests/functional/yii → apps/advanced/tests/codeception/bin/yii

@@ -8,9 +8,24 @@
  * @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_APP_BASE_PATH . '/common/config/main.php'),
+    require(YII_APP_BASE_PATH . '/common/config/main-local.php'),
+    require(YII_APP_BASE_PATH . '/console/config/main.php'),
+    require(YII_APP_BASE_PATH . '/console/config/main-local.php'),
+    require(dirname(__DIR__) . '/config/config.php'),
+    [
+        'controllerMap' => [
+            'fixture' => [
+                'class' => 'yii\faker\FixtureController',
+                'fixtureDataPath' => '@tests/codeception/common/fixtures',
+                'templatePath' => '@tests/codeception/common/templates',
+            ],
+        ],
+    ]
+);
 
 $application = new yii\console\Application($config);
 $exitCode = $application->run();

apps/advanced/backend/tests/acceptance/yii.bat → apps/advanced/tests/codeception/bin/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 -------------------------------------------------------------
 
@@ -15,6 +15,6 @@ set YII_PATH=%~dp0
 
 if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
 
-"%PHP_COMMAND%" "%YII_PATH%yii" %*
+"%PHP_COMMAND%" "%YII_PATH%yii_acceptance" %*
 
 @endlocal

apps/advanced/tests/codeception/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_APP_BASE_PATH') or define('YII_APP_BASE_PATH', dirname(dirname(dirname(__DIR__))));
+
+require_once(YII_APP_BASE_PATH . '/vendor/autoload.php');
+require_once(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.php');
+require(YII_APP_BASE_PATH . '/common/config/aliases.php');
+
+// set correct script paths
+$_SERVER['SERVER_NAME'] = 'localhost';
+
+Yii::setAlias('@tests', dirname(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 tests\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 tests\codeception\common\_support;
 
+use tests\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;
@@ -52,8 +52,8 @@ class FixtureHelper extends Module
     {
         return [
             'user' => [
-                'class' =>  UserFixture::className(),
-                'dataFile' => '@common/tests/fixtures/data/init_login.php',
+                'class' => UserFixture::className(),
+                'dataFile' => '@tests/codeception/common/fixtures/data/init_login.php',
             ],
         ];
     }

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

+namespace: tests\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 tests\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 tests\codeception\common\unit;
 
+/**
+ * @inheritdoc
+ */
 class DbTestCase extends \yii\codeception\DbTestCase
 {
-    public $appConfig = '@common/tests/unit/_config.php';
+    public $appConfig = '@tests/codeception/config/common/unit.php';
 }

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

 <?php
 
-namespace common\tests\unit;
+namespace tests\codeception\common\unit;
 
+/**
+ * @inheritdoc
+ */
 class TestCase extends \yii\codeception\TestCase
 {
-    public $appConfig = '@common/tests/unit/_config.php';
+    public $appConfig = '@tests/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 tests\codeception\common\unit\models;
 
 use Yii;
-use common\tests\unit\DbTestCase;
+use tests\codeception\common\unit\DbTestCase;
 use Codeception\Specify;
 use common\models\LoginForm;
-use common\tests\fixtures\UserFixture;
+use tests\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' => '@tests/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,
-        ],
-    ],
-];
+
+];
\ No newline at end of file

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

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

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

+<?php
+/**
+ * Application configuration for all backend test types
+ */
+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;
+
+/**
+ * Application configuration for backend functional tests
+ */
+return yii\helpers\ArrayHelper::merge(
+    require(YII_APP_BASE_PATH . '/backend/config/main.php'),
+    require(YII_APP_BASE_PATH . '/backend/config/main-local.php'),
+    require(YII_APP_BASE_PATH . '/common/config/main.php'),
+    require(YII_APP_BASE_PATH . '/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
+
+/**
+ * Application configuration for backend unit tests
+ */
+return yii\helpers\ArrayHelper::merge(
+    require(YII_APP_BASE_PATH . '/common/config/main.php'),
+    require(YII_APP_BASE_PATH . '/common/config/main-local.php'),
+    require(YII_APP_BASE_PATH . '/backend/config/main.php'),
+    require(YII_APP_BASE_PATH . '/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_APP_BASE_PATH . '/common/config/main.php'),
+    require(YII_APP_BASE_PATH . '/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' => [
+        'db' => [
+            'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_tests',
+        ],
         'mailer' => [
             'useFileTransport' => true,
         ],

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

+<?php
+/**
+ * Application configuration for console unit tests
+ */
+return yii\helpers\ArrayHelper::merge(
+    require(YII_APP_BASE_PATH . '/common/config/main.php'),
+    require(YII_APP_BASE_PATH . '/common/config/main-local.php'),
+    require(YII_APP_BASE_PATH . '/console/config/main.php'),
+    require(YII_APP_BASE_PATH . '/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_APP_BASE_PATH') or define('YII_APP_BASE_PATH', dirname(dirname(dirname(dirname(__DIR__)))));
+
+/**
+ * Application configuration for frontend acceptance tests
+ */
+return yii\helpers\ArrayHelper::merge(
+    require(YII_APP_BASE_PATH . '/common/config/main.php'),
+    require(YII_APP_BASE_PATH . '/common/config/main-local.php'),
+    require(YII_APP_BASE_PATH . '/frontend/config/main.php'),
+    require(YII_APP_BASE_PATH . '/frontend/config/main-local.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/acceptance.php'),
+    require(__DIR__ . '/config.php'),
+    [
+    ]
+);

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

+<?php
+/**
+ * Application configuration for all frontend test types
+ */
+return [];
\ No newline at end of file