Merge commit 'fcac7f64' into feature/gii-extension-generator

.scrutinizer.yml

+imports:
+    - php
+
+tools:
+    external_code_coverage:
+        timeout: 1800 # Timeout in seconds.

.travis.yml

@@ -15,7 +15,6 @@ services:
 install:
   - composer self-update && composer --version
 # core framework:
-#  - composer require satooshi/php-coveralls 0.6.* --dev --prefer-dist
   - composer install --prefer-dist
   - tests/unit/data/travis/mongodb-setup.sh
   - tests/unit/data/travis/apc-setup.sh
@@ -35,9 +34,9 @@ before_script:
   - mongo yii2test --eval 'db.addUser("travis", "test");'
 
 script:
-#  - vendor/bin/phpunit --coverage-clover tests/unit/runtime/coveralls/clover.xml --verbose --exclude-group mssql,oci,wincache,xcache,zenddata,vendor
-  - vendor/bin/phpunit --verbose --exclude-group mssql,oci,wincache,xcache,zenddata,vendor
+  - vendor/bin/phpunit --verbose --coverage-clover=coverage.clover --exclude-group mssql,oci,wincache,xcache,zenddata
   - cd apps/basic && php vendor/bin/codecept run
 
-#after_script:
-#  - php vendor/bin/coveralls
+after_script:
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover

README.md

@@ -21,6 +21,7 @@ which is the latest stable release of Yii.
 [![Latest Stable Version](https://poser.pugx.org/yiisoft/yii2/v/stable.png)](https://packagist.org/packages/yiisoft/yii2)
 [![Total Downloads](https://poser.pugx.org/yiisoft/yii2/downloads.png)](https://packagist.org/packages/yiisoft/yii2)
 [![Build Status](https://secure.travis-ci.org/yiisoft/yii2.png)](http://travis-ci.org/yiisoft/yii2)
+[![Code Coverage](https://scrutinizer-ci.com/g/yiisoft/yii2/badges/coverage.png?s=31d80f1036099e9d6a3e4d7738f6b000b3c3d10e)](https://scrutinizer-ci.com/g/yiisoft/yii2/)
 [![Dependency Status](https://www.versioneye.com/php/yiisoft:yii2/dev-master/badge.png)](https://www.versioneye.com/php/yiisoft:yii2/dev-master)
 [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/yiisoft/yii2/badges/quality-score.png?s=b1074a1ff6d0b214d54fa5ab7abbb90fc092471d)](https://scrutinizer-ci.com/g/yiisoft/yii2/)
 
@@ -49,8 +50,9 @@ DOCUMENTATION
 
 A draft of the [Definitive Guide](docs/guide/index.md) is available.
 
-API docs and a (quite bad) rendering of the definitive guide are currently
+API docs and a rendering of the definitive guide are currently
 available at http://stuff.cebe.cc/yii2docs/ (updated four times per hour).
+We will make guide and API docs available on yiiframework.com with the beta release.
 
 For 1.1 users, you may refer to [Upgrading from Yii 1.1](docs/guide/upgrade-from-v1.md)
 to have a general idea of what has changed in 2.0.

apps/advanced/README.md

@@ -16,32 +16,37 @@ DIRECTORY STRUCTURE
 
 ```
 common
-	config/             contains shared configurations
-	models/             contains model classes used in both backend and frontend
+	config/				contains shared configurations
+	mail/				contains view files for e-mails
+	models/				contains model classes used in both backend and frontend
+	tests/				contains various tests for objects that are common among applications
 console
-	config/             contains console configurations
-	controllers/        contains console controllers (commands)
-	migrations/         contains database migrations
-	models/             contains console-specific model classes
-	runtime/            contains files generated during runtime
+	config/				contains console configurations
+	controllers/		contains console controllers (commands)
+	migrations/			contains database migrations
+	models/				contains console-specific model classes
+	runtime/			contains files generated during runtime
+	tests/				contains various tests for the console application
 backend
-	assets/             contains application assets such as JavaScript and CSS
-	config/             contains backend configurations
-	controllers/        contains Web controller classes
-	models/             contains backend-specific model classes
-	runtime/            contains files generated during runtime
-	views/              contains view files for the Web application
-	web/                contains the entry script and Web resources
+	assets/				contains application assets such as JavaScript and CSS
+	config/				contains backend configurations
+	controllers/		contains Web controller classes
+	models/				contains backend-specific model classes
+	runtime/			contains files generated during runtime
+	tests/				contains various tests for the backend application
+	views/				contains view files for the Web application
+	web/				contains the entry script and Web resources
 frontend
-	assets/             contains application assets such as JavaScript and CSS
-	config/             contains frontend configurations
-	controllers/        contains Web controller classes
-	models/             contains frontend-specific model classes
-	runtime/            contains files generated during runtime
-	views/              contains view files for the Web application
-	web/                contains the entry script and Web resources
-vendor/                 contains dependent 3rd-party packages
-environments/                contains environment-based overrides
+	assets/				contains application assets such as JavaScript and CSS
+	config/				contains frontend configurations
+	controllers/		contains Web controller classes
+	models/				contains frontend-specific model classes
+	runtime/			contains files generated during runtime
+	tests/				contains various tests for the frontend application
+	views/				contains view files for the Web application
+	web/				contains the entry script and Web resources
+vendor/					contains dependent 3rd-party packages
+environments/			contains environment-based overrides
 ```
 
 
@@ -82,8 +87,39 @@ the installed application. You only need to do these once for all.
 
 1. Run command `init` to initialize the application with a specific environment.
 2. Create a new database and adjust the `components['db']` configuration in `common/config/main-local.php` accordingly.
-3. Apply migrations with console command `yii migrate`.
+3. Apply migrations with console command `yii migrate`. This will create tables needed for the application to work.
 4. Set document roots of your Web server:
 
 - for frontend `/path/to/yii-application/frontend/web/` and using the URL `http://frontend/`
 - for backend `/path/to/yii-application/backend/web/` and using the URL `http://backend/`
+
+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: 1.8.*@dev" "codeception/specify: *" "codeception/verify: *"`
+
+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 should configure your server to point doc_root to your new created application. For example if we
+use php builtin server, then all that is needed to do is run `php -S 127.0.0.1:8080` in main project directory - directory that contains `frontend`, `backend`, `common`, `console` directories.
+
+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`.
+
+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`.

apps/advanced/backend/codeception.yml

+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/backend/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', '/backend/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');
+
+require(__DIR__ . '/../../common/config/aliases.php');
+
+// set correct script paths
+$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
+$_SERVER['SERVER_NAME'] = 'localhost';

apps/advanced/backend/tests/_config.php

+<?php
+/**
+ * application configurations shared by all test types
+ */
+return [
+	'components' => [
+		'mail' => [
+			'useFileTransport' => true,
+		],
+		'urlManager' => [
+			'showScriptName' => true,
+		],
+	],
+];

apps/advanced/backend/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/backend/tests/_data/dump.sql

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

apps/advanced/backend/tests/_helpers/CodeHelper.php

+<?php
+namespace Codeception\Module;
+
+// here you can define custom functions for CodeGuy 
+
+class CodeHelper extends \Codeception\Module
+{
+}

apps/advanced/backend/tests/_helpers/TestHelper.php

+<?php
+namespace Codeception\Module;
+
+// here you can define custom functions for TestGuy 
+
+class TestHelper extends \Codeception\Module
+{
+}

apps/advanced/backend/tests/_helpers/WebHelper.php

+<?php
+namespace Codeception\Module;
+
+// here you can define custom functions for WebGuy 
+
+class WebHelper extends \Codeception\Module
+{
+}

apps/advanced/backend/tests/_log/.gitignore

+*
+!.gitignore

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

+# Codeception Test Suite Configuration
+
+# suite for acceptance tests.
+# perform tests in browser using the Selenium-like tools.
+# powered by Mink (http://mink.behat.org).
+# (tip: that's what your customer will see).
+# (tip: test your ajax and javascript by one of Mink drivers).
+
+# RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
+
+class_name: WebGuy
+modules:
+    enabled:
+        - WebHelper
+        - PhpBrowser
+        - common\tests\_helpers\FixtureHelper
+# you can use WebDriver instead of PhpBrowser to test javascript and ajax.
+# This will require you to install selenium. See http://codeception.com/docs/04-AcceptanceTests#Selenium
+# "restart" option is used by the WebDriver to start each time per test-file new session and cookies, 
+# it is useful if you want to login in your app in each test.
+#        - WebDriver
+    config:
+        PhpBrowser:
+            url: 'http://localhost:8080'
+#        WebDriver:
+#            url: 'http://localhost'
+#            browser: firefox
+#            restart: true

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

+<?php
+
+use common\tests\_pages\LoginPage;
+
+$I = new WebGuy($scenario);
+$I->wantTo('ensure login page works');
+
+$loginPage = LoginPage::openBy($I);
+
+$I->amGoingTo('submit login form with no data');
+$loginPage->login('', '');
+$I->expectTo('see validations errors');
+$I->see('Username cannot be blank.');
+$I->see('Password cannot be blank.');
+
+$I->amGoingTo('try to login with wrong credentials');
+$I->expectTo('see validations errors');
+$loginPage->login('admin', 'wrong');
+$I->expectTo('see validations errors');
+$I->see('Incorrect username or password.');
+
+$I->amGoingTo('try to login with correct credentials');
+$loginPage->login('erau', 'password_0');
+$I->expectTo('see that user is logged');
+$I->see('Logout (erau)');
+$I->dontSee('Login');
+$I->dontSee('Signup');
+$I->click('Logout (erau)');
+$I->dontSee('Logout (erau)');
+$I->see('Login');

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

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

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/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/tests/functional.suite.yml

+# Codeception Test Suite Configuration
+
+# suite for functional (integration) tests.
+# emulate web requests and make application process them.
+# (tip: better to use with frameworks).
+
+# RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
+#basic/web/index.php
+class_name: TestGuy
+modules:
+    enabled:
+      - Filesystem
+      - TestHelper
+      - Yii2
+      - common\tests\_helpers\FixtureHelper
+    config:
+        Yii2:
+            configFile: 'tests/functional/_config.php'

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

+<?php
+
+use common\tests\_pages\LoginPage;
+
+$I = new TestGuy($scenario);
+$I->wantTo('ensure login page works');
+
+$loginPage = LoginPage::openBy($I);
+
+$I->amGoingTo('submit login form with no data');
+$loginPage->login('', '');
+$I->expectTo('see validations errors');
+$I->see('Username cannot be blank.');
+$I->see('Password cannot be blank.');
+
+$I->amGoingTo('try to login with wrong credentials');
+$I->expectTo('see validations errors');
+$loginPage->login('admin', 'wrong');
+$I->expectTo('see validations errors');
+$I->see('Incorrect username or password.');
+
+$I->amGoingTo('try to login with correct credentials');
+$loginPage->login('erau', 'password_0');
+$I->expectTo('see that user is logged');
+$I->see('Logout (erau)');
+$I->dontSee('Login');
+$I->dontSee('Signup');
+$I->click('Logout (erau)');
+$I->dontSee('Logout (erau)');
+$I->see('Login');

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

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

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

+# Codeception Test Suite Configuration
+
+# suite for unit (internal) tests.
+# RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
+
+class_name: CodeGuy
+modules:
+    enabled: [CodeHelper]

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

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

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

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

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

+<?php
+// Here you can initialize variables that will for your tests

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',
+			],
+		],
+	]
+);

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/backend/views/site/login.php

@@ -22,7 +22,7 @@ $this->params['breadcrumbs'][] = $this->title;
 				<?= $form->field($model, 'password')->passwordInput() ?>
 				<?= $form->field($model, 'rememberMe')->checkbox() ?>
 				<div class="form-group">
-					<?= Html::submitButton('Login', ['class' => 'btn btn-primary']) ?>
+					<?= Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
 				</div>
 			<?php ActiveForm::end(); ?>
 		</div>

apps/advanced/common/codeception.yml

+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/mail/passwordResetToken.php

@@ -6,7 +6,7 @@ use yii\helpers\Html;
  * @var common\models\User $user
  */
 
-$resetLink = Yii::$app->urlManager->createAbsoluteUrl('site/reset-password', ['token' => $user->password_reset_token]);
+$resetLink = Yii::$app->urlManager->createAbsoluteUrl(['site/reset-password', 'token' => $user->password_reset_token]);
 ?>
 
 Hello <?= Html::encode($user->username) ?>,

apps/advanced/common/models/LoginForm.php

@@ -23,10 +23,10 @@ class LoginForm extends Model
 		return [
 			// username and password are both required
 			[['username', 'password'], 'required'],
-			// password is validated by validatePassword()
-			['password', 'validatePassword'],
 			// rememberMe must be a boolean value
 			['rememberMe', 'boolean'],
+			// password is validated by validatePassword()
+			['password', 'validatePassword'],
 		];
 	}
 
@@ -36,9 +36,11 @@ class LoginForm extends Model
 	 */
 	public function validatePassword()
 	{
-		$user = $this->getUser();
-		if (!$user || !$user->validatePassword($this->password)) {
-			$this->addError('password', 'Incorrect username or password.');
+		if (!$this->hasErrors()) {
+			$user = $this->getUser();
+			if (!$user || !$user->validatePassword($this->password)) {
+				$this->addError('password', 'Incorrect username or password.');
+			}
 		}
 	}
 
@@ -61,7 +63,7 @@ class LoginForm extends Model
 	 *
 	 * @return User|null
 	 */
-	private function getUser()
+	public function getUser()
 	{
 		if ($this->_user === false) {
 			$this->_user = User::findByUsername($this->username);

apps/advanced/common/models/User.php

@@ -54,10 +54,10 @@ class User extends ActiveRecord implements IdentityInterface
 	{
 		return [
 			'timestamp' => [
-				'class' => 'yii\behaviors\AutoTimestamp',
+				'class' => 'yii\behaviors\TimestampBehavior',
 				'attributes' => [
 					ActiveRecord::EVENT_BEFORE_INSERT => ['created_at', 'updated_at'],
-					ActiveRecord::EVENT_BEFORE_UPDATE => 'updated_at',
+					ActiveRecord::EVENT_BEFORE_UPDATE => ['updated_at'],
 				],
 			],
 		];

apps/advanced/common/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', '/index-test.php');
+
+// the entry script file path for functional and acceptance tests
+defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(__DIR__) . '/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');
+
+require(__DIR__ . '/../../common/config/aliases.php');
+
+// set correct script paths
+$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
+$_SERVER['SERVER_NAME'] = 'localhost';

apps/advanced/common/tests/_config.php

+<?php
+/**
+ * application configurations shared by all test types
+ */
+return [
+	'components' => [
+		'mail' => [
+			'useFileTransport' => true,
+		],
+		'urlManager' => [
+			'showScriptName' => true,
+		],
+	],
+];

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/_helpers/CodeHelper.php

+<?php
+namespace Codeception\Module;
+
+// here you can define custom functions for CodeGuy 
+
+class CodeHelper extends \Codeception\Module
+{
+}

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

+<?php
+
+namespace common\tests\_helpers;
+
+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.
+ * For example - populate database with demo login user that should be used in acceptance and functional tests.
+ * All fixtures will be loaded before suite will be starded and unloaded after it.
+ */
+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.
+	 */
+	use FixtureTrait {
+		loadFixtures as protected;
+		fixtures as protected;
+		globalFixtures as protected;
+		unloadFixtures as protected;
+		getFixtures as protected;
+		getFixture as protected;
+	}
+
+	/**
+	 * Method called before any suite tests run. Loads User fixture login user
+	 * to use in acceptance and functional tests.
+	 * @param array $settings
+	 */
+	public function _beforeSuite($settings = array())
+	{
+		$this->loadFixtures();
+	}
+
+	/**
+	 * Method is called after all suite tests run
+	 */
+	public function _afterSuite()
+	{
+		$this->unloadFixtures();
+	}
+
+	protected function fixtures()
+	{
+		return [
+			'user' => [
+				'class' =>  UserFixture::className(),
+				'dataFile' => '@common/tests/fixtures/data/init_login.php',
+			],
+		];
+	}
+
+}

apps/advanced/common/tests/_helpers/TestHelper.php

+<?php
+namespace Codeception\Module;
+
+// here you can define custom functions for TestGuy 
+
+class TestHelper extends \Codeception\Module
+{
+}

apps/advanced/common/tests/_helpers/WebHelper.php

+<?php
+namespace Codeception\Module;
+
+// here you can define custom functions for WebGuy 
+
+class WebHelper extends \Codeception\Module
+{
+}

apps/advanced/common/tests/_log/.gitignore

+*
+!.gitignore

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

+<?php
+
+namespace common\tests\_pages;
+
+use yii\codeception\BasePage;
+
+class LoginPage extends BasePage
+{
+	public $route = 'site/login';
+
+	/**
+	 * @param string $username
+	 * @param string $password
+	 */
+	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');
+	}
+
+}

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

+<?php
+
+namespace common\tests\fixtures;
+
+use yii\test\ActiveFixture;
+
+class UserFixture extends ActiveFixture
+{
+	public $modelClass = 'common\models\User';
+}

apps/advanced/common/tests/fixtures/data/init_login.php

+<?php
+
+return [
+	[
+		'username' => 'erau',
+		'auth_key' => 'tUu1qHcde0diwUol3xeI-18MuHkkprQI',
+		// password_0
+		'password_hash' => '$2y$13$nJ1WDlBaGcbCdbNC5.5l4.sgy.OMEKCqtDQOdQ2OWpgiKRWYyzzne',
+		'password_reset_token' => 'RkD_Jw0_8HEedzLk7MM-ZKEFfYR7VbMr_1392559490',
+		'created_at' => '1392559490',
+		'updated_at' => '1392559490',
+		'email' => 'sfriesen@jenkins.info',
+	],
+];

apps/advanced/common/tests/templates/fixtures/tbl_user.php

+<?php
+
+use yii\helpers\Security;
+
+return [
+	'username' => 'userName',
+	'auth_key' => function ($fixture, $faker, $index) {
+		$fixture['auth_key'] = Security::generateRandomKey();
+		return $fixture;
+	},
+	'password_hash' => function ($fixture, $faker, $index) {
+		$fixture['password_hash'] = Security::generatePasswordHash('password_' . $index);
+		return $fixture;
+	},
+	'password_reset_token' => function ($fixture, $faker, $index) {
+		$fixture['password_reset_token'] = Security::generateRandomKey() . '_' . time();
+		return $fixture;
+	},
+	'created_at' => function ($fixture, $faker, $index) {
+		$fixture['created_at'] = time();
+		return $fixture;
+	},
+	'updated_at' => function ($fixture, $faker, $index) {
+		$fixture['updated_at'] = time();
+		return $fixture;
+	},
+	'email' => 'email',
+];

apps/advanced/common/tests/unit.suite.yml

+# Codeception Test Suite Configuration
+
+# suite for unit (internal) tests.
+# RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
+
+class_name: CodeGuy
+modules:
+    enabled:
+      - CodeHelper

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

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

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

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

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

+<?php
+// Here you can initialize variables that will for your tests

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',
+		],
+	]
+);

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',
+			],
+		],
+	]
+);

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

+<?php
+
+namespace common\tests\unit\models;
+
+use Yii;
+use frontend\tests\unit\TestCase;
+use common\models\User;
+use yii\helpers\Security;
+
+class LoginFormTest extends TestCase
+{
+	
+	use \Codeception\Specify;
+
+	protected function tearDown()
+	{
+		Yii::$app->user->logout();
+		parent::tearDown();
+	}
+
+	public function testLoginNoUser()
+	{
+		$model = $this->mockUser(null);
+
+		$model->username = 'some_username';
+		$model->password = 'some_password';
+
+		$this->specify('user should not be able to login, when there is no identity' , function () use ($model) {
+			expect('model should not login user', $model->login())->false();
+			expect('user should not be logged in', Yii::$app->user->isGuest)->true();
+		});
+	}
+
+	public function testLoginWrongPassword()
+	{
+		$model = $this->mockUser(new User(['password_hash' => Security::generatePasswordHash('will-not-match')]));
+
+		$model->username = 'demo';
+		$model->password = 'wrong-password';
+
+		$this->specify('user should not be able to login with wrong password', function () use ($model) {
+			expect('model should not login user', $model->login())->false();
+			expect('error message should be set', $model->errors)->hasKey('password');
+			expect('user should not be logged in', Yii::$app->user->isGuest)->true();
+		});
+	}
+
+	public function testLoginCorrect()
+	{
+		$model = $this->mockUser(new User(['password_hash' => Security::generatePasswordHash('demo')]));
+
+		$model->username = 'demo';
+		$model->password = 'demo';
+
+		$this->specify('user should be able to login with correct credentials', function() use ($model) {
+			expect('model should login user', $model->login())->true();
+			expect('error message should not be set', $model->errors)->hasntKey('password');
+			expect('user should be logged in', Yii::$app->user->isGuest)->false();
+		});
+	}
+
+	private function mockUser($user)
+	{
+		$loginForm = $this->getMock('common\models\LoginForm',['getUser']);
+		$loginForm->expects($this->any())->method('getUser')->will($this->returnValue($user));
+		return $loginForm;
+	}
+
+}

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

@@ -20,9 +20,16 @@
 		"yiisoft/yii2-swiftmailer": "*"
 	},
 	"require-dev": {
+		"yiisoft/yii2-codeception": "*",
 		"yiisoft/yii2-debug": "*",
 		"yiisoft/yii2-gii": "*"
 	},
+	"suggest": {
+		"codeception/codeception": "Codeception, 1.8.*@dev 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"
+	},
 	"scripts": {
 		"post-create-project-cmd": [
 			"yii\\composer\\Installer::setPermission"

apps/advanced/console/codeception.yml

+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/_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', '/index-test.php');
+
+// the entry script file path for functional and acceptance tests
+defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(__DIR__) . '/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');
+
+require(__DIR__ . '/../../common/config/aliases.php');
+
+// set correct script paths
+$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
+$_SERVER['SERVER_NAME'] = 'localhost';

apps/advanced/console/tests/_config.php

+<?php
+/**
+ * application configurations shared by all test types
+ */
+return [
+	'components' => [
+		'mail' => [
+			'useFileTransport' => true,
+		],
+		'urlManager' => [
+			'showScriptName' => true,
+		],
+	],
+];

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/_helpers/CodeHelper.php

+<?php
+namespace Codeception\Module;
+
+// here you can define custom functions for CodeGuy 
+
+class CodeHelper extends \Codeception\Module
+{
+}

apps/advanced/console/tests/_helpers/TestHelper.php

+<?php
+namespace Codeception\Module;
+
+// here you can define custom functions for TestGuy 
+
+class TestHelper extends \Codeception\Module
+{
+}

apps/advanced/console/tests/_helpers/WebHelper.php

+<?php
+namespace Codeception\Module;
+
+// here you can define custom functions for WebGuy 
+
+class WebHelper extends \Codeception\Module
+{
+}

apps/advanced/console/tests/_log/.gitignore

+*
+!.gitignore

apps/advanced/console/tests/unit.suite.yml

+# Codeception Test Suite Configuration
+
+# suite for unit (internal) tests.
+# RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
+
+class_name: CodeGuy
+modules:
+    enabled: [CodeHelper]

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

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

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

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

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

+<?php
+// Here you can initialize variables that will for your tests

apps/advanced/console/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',
+			],
+		],
+	]
+);

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',
+			],
+		],
+	]
+);

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/config/main-local.php

 <?php
-return [
-	'preload' => [
-		'debug',
-	],
-	'modules' => [
-		'debug' => 'yii\debug\Module',
-		'gii' => 'yii\gii\Module',
-	],
-];
+
+$config = [];
+
+if (!YII_ENV_TEST) {
+	// configuration adjustments for 'dev' environment
+	$config['preload'][] = 'debug';
+	$config['modules']['debug'] = 'yii\debug\Module';
+	$config['modules']['gii'] = 'yii\gii\Module';
+}
+
+return $config;

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

+<?php
+
+// NOTE: Make sure this file is not accessible when deployed to production
+if (!in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'])) {
+	die('You are not allowed to access this file.');
+}
+
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_ENV') or define('YII_ENV', 'test');
+
+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');
+
+(new yii\web\Application($config))->run();

apps/advanced/environments/dev/frontend/config/main-local.php

 <?php
-return [
-	'preload' => [
-		'debug',
-	],
-	'modules' => [
-		'debug' => 'yii\debug\Module',
-		'gii' => 'yii\gii\Module',
-	],
-];
+
+$config = [];
+
+if (!YII_ENV_TEST) {
+	// configuration adjustments for 'dev' environment
+	$config['preload'][] = 'debug';
+	$config['modules']['debug'] = 'yii\debug\Module';
+	$config['modules']['gii'] = 'yii\gii\Module';
+}
+
+return $config;

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

+<?php
+
+// NOTE: Make sure this file is not accessible when deployed to production
+if (!in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'])) {
+	die('You are not allowed to access this file.');
+}
+
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_ENV') or define('YII_ENV', 'test');
+
+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');
+
+(new yii\web\Application($config))->run();

apps/advanced/frontend/codeception.yml

+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/frontend/controllers/SiteController.php

@@ -87,8 +87,12 @@ class SiteController extends Controller
 	public function actionContact()
 	{
 		$model = new ContactForm();
-		if ($model->load(Yii::$app->request->post()) && $model->contact(Yii::$app->params['adminEmail'])) {
-			Yii::$app->session->setFlash('success', 'Thank you for contacting us. We will respond to you as soon as possible.');
+		if ($model->load(Yii::$app->request->post()) && $model->validate()) {
+			if ($model->sendEmail(Yii::$app->params['adminEmail'])) {
+				Yii::$app->session->setFlash('success', 'Thank you for contacting us. We will respond to you as soon as possible.');
+			} else {
+				Yii::$app->session->setFlash('error', 'There was an error sending email.');
+			}
 			return $this->refresh();
 		} else {
 			return $this->render('contact', [
@@ -122,7 +126,7 @@ class SiteController extends Controller
 	public function actionRequestPasswordReset()
 	{
 		$model = new PasswordResetRequestForm();
-		if ($model->load(Yii::$app->request->post())) {
+		if ($model->load(Yii::$app->request->post()) && $model->validate()) {
 			if ($model->sendEmail()) {
 				Yii::$app->getSession()->setFlash('success', 'Check your email for further instructions.');
 				return $this->goHome();
@@ -144,7 +148,7 @@ class SiteController extends Controller
 			throw new BadRequestHttpException($e->getMessage());
 		}
 
-		if ($model->load(Yii::$app->request->post()) && $model->resetPassword()) {
+		if ($model->load(Yii::$app->request->post()) && $model->validate() && $model->resetPassword()) {
 			Yii::$app->getSession()->setFlash('success', 'New password was saved.');
 			return $this->goHome();
 		}

apps/advanced/frontend/models/ContactForm.php

@@ -45,20 +45,15 @@ class ContactForm extends Model
 	 * Sends an email to the specified email address using the information collected by this model.
 	 *
 	 * @param string $email the target email address
-	 * @return boolean whether the model passes validation
+	 * @return boolean whether the email was sent
 	 */
-	public function contact($email)
+	public function sendEmail($email)
 	{
-		if ($this->validate()) {
-			Yii::$app->mail->compose()
-				->setTo($email)
-				->setFrom([$this->email => $this->name])
-				->setSubject($this->subject)
-				->setTextBody($this->body)
-				->send();
-			return true;
-		} else {
-			return false;
-		}
+		return Yii::$app->mail->compose()
+			->setTo($email)
+			->setFrom([$this->email => $this->name])
+			->setSubject($this->subject)
+			->setTextBody($this->body)
+			->send();
 	}
 }

apps/advanced/frontend/models/PasswordResetRequestForm.php

@@ -20,7 +20,11 @@ class PasswordResetRequestForm extends Model
 			['email', 'filter', 'filter' => 'trim'],
 			['email', 'required'],
 			['email', 'email'],
-			['email', 'exist', 'targetClass' => '\common\models\User', 'message' => 'There is no user with such email.'],
+			['email', 'exist',
+				'targetClass' => '\common\models\User',
+				'filter' => ['status' => User::STATUS_ACTIVE],
+				'message' => 'There is no user with such email.'
+			],
 		];
 	}
 
@@ -37,17 +41,15 @@ class PasswordResetRequestForm extends Model
 			'email' => $this->email,
 		]);
 
-		if (!$user) {
-			return false;
-		}
-
-		$user->generatePasswordResetToken();
-		if ($user->save()) {
-			return \Yii::$app->mail->compose('passwordResetToken', ['user' => $user])
-				->setFrom([\Yii::$app->params['supportEmail'] => \Yii::$app->name . ' robot'])
-				->setTo($this->email)
-				->setSubject('Password reset for ' . \Yii::$app->name)
-				->send();
+		if ($user) {
+			$user->generatePasswordResetToken();
+			if ($user->save()) {
+				return \Yii::$app->mail->compose('passwordResetToken', ['user' => $user])
+					->setFrom([\Yii::$app->params['supportEmail'] => \Yii::$app->name . ' robot'])
+					->setTo($this->email)
+					->setSubject('Password reset for ' . \Yii::$app->name)
+					->send();
+			}
 		}
 
 		return false;

apps/advanced/frontend/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', '/frontend/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');
+
+require(__DIR__ . '/../../common/config/aliases.php');
+
+// set correct script paths
+$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
+$_SERVER['SERVER_NAME'] = 'localhost';

apps/advanced/frontend/tests/_config.php

+<?php
+/**
+ * application configurations shared by all test types
+ */
+return [
+	'components' => [
+		'mail' => [
+			'useFileTransport' => true,
+		],
+		'urlManager' => [
+			'showScriptName' => true,
+		],
+	],
+];

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/_helpers/CodeHelper.php

+<?php
+namespace Codeception\Module;
+
+// here you can define custom functions for CodeGuy 
+
+class CodeHelper extends \Codeception\Module
+{
+}

apps/advanced/frontend/tests/_helpers/TestHelper.php

+<?php
+namespace Codeception\Module;
+
+// here you can define custom functions for TestGuy 
+
+class TestHelper extends \Codeception\Module
+{
+}

apps/advanced/frontend/tests/_helpers/WebHelper.php

+<?php
+namespace Codeception\Module;
+
+// here you can define custom functions for WebGuy 
+
+class WebHelper extends \Codeception\Module
+{
+}

apps/advanced/frontend/tests/_log/.gitignore

+*
+!.gitignore

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

+<?php
+
+namespace frontend\tests\_pages;
+
+use yii\codeception\BasePage;
+
+class AboutPage extends BasePage
+{
+	public $route = 'site/about';
+}

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

+<?php
+
+namespace frontend\tests\_pages;
+
+use yii\codeception\BasePage;
+
+class ContactPage extends BasePage
+{
+	public $route = 'site/contact';
+
+	/**
+	 * @param array $contactData
+	 */
+	public function submit(array $contactData)
+	{
+		foreach ($contactData as $field => $value) {
+			$inputType = $field === 'body' ? 'textarea' : 'input';
+			$this->guy->fillField($inputType . '[name="ContactForm[' . $field . ']"]', $value);
+		}
+		$this->guy->click('contact-button');
+	}
+}

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

+<?php
+
+namespace frontend\tests\_pages;
+
+use \yii\codeception\BasePage;
+
+class SignupPage extends BasePage
+{
+
+	public $route = 'site/signup';
+
+	/**
+	 * @param array $signupData
+	 */
+	public function submit(array $signupData)
+	{
+		foreach ($signupData as $field => $value) {
+			$inputType = $field === 'body' ? 'textarea' : 'input';
+			$this->guy->fillField($inputType . '[name="SignupForm[' . $field . ']"]', $value);
+		}
+		$this->guy->click('signup-button');
+	}
+
+}

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

+# Codeception Test Suite Configuration
+
+# suite for acceptance tests.
+# perform tests in browser using the Selenium-like tools.
+# powered by Mink (http://mink.behat.org).
+# (tip: that's what your customer will see).
+# (tip: test your ajax and javascript by one of Mink drivers).
+
+# RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
+
+class_name: WebGuy
+modules:
+    enabled:
+        - WebHelper
+        - PhpBrowser
+        - common\tests\_helpers\FixtureHelper
+# you can use WebDriver instead of PhpBrowser to test javascript and ajax.
+# This will require you to install selenium. See http://codeception.com/docs/04-AcceptanceTests#Selenium
+# "restart" option is used by the WebDriver to start each time per test-file new session and cookies, 
+# it is useful if you want to login in your app in each test.
+#        - WebDriver
+    config:
+        PhpBrowser:
+            url: 'http://localhost:8080'
+#        WebDriver:
+#            url: 'http://localhost'
+#            browser: firefox
+#            restart: true