Added acceptance tests for the basic app.

apps/basic/codeception.yml

@@ -0,0 +1,18 @@
+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/basic/config/web-test.php

@@ -0,0 +1,7 @@
+<?php
+
+$config = require(__DIR__ . '/web.php');
+
+// ... customize $config for the "test" environment here...
+
+return $config;

apps/basic/config/web.php

@@ -1,14 +1,9 @@
 <?php
-$params = require(__DIR__ . '/params.php');
+
 return array(
 	'id' => 'bootstrap',
 	'basePath' => dirname(__DIR__),
 	'preload' => array('log'),
-	'modules' => array(
-//		'debug' => array(
-//			'class' => 'yii\debug\Module',
-//		)
-	),
 	'components' => array(
 		'cache' => array(
 			'class' => 'yii\caching\FileCache',
@@ -27,11 +22,8 @@ return array(
 					'class' => 'yii\logging\FileTarget',
 					'levels' => array('error', 'warning'),
 				),
-//				array(
-//					'class' => 'yii\logging\DebugTarget',
-//				)
 			),
 		),
 	),
-	'params' => $params,
+	'params' => require(__DIR__ . '/params.php'),
 );

apps/basic/controllers/SiteController.php

@@ -14,6 +14,7 @@ class SiteController extends Controller
 		return array(
 			'captcha' => array(
 				'class' => 'yii\web\CaptchaAction',
+				'fixedVerifyCode' => YII_ENV === 'test' ? 'testme' : null,
 			),
 		);
 	}

apps/basic/tests/_data/dump.sql

@@ -0,0 +1 @@
+/* Replace this file with actual dump of your database */

apps/basic/tests/_helpers/CodeHelper.php

@@ -0,0 +1,8 @@
+<?php
+namespace Codeception\Module;
+
+// here you can define custom functions for CodeGuy 
+
+class CodeHelper extends \Codeception\Module
+{
+}

apps/basic/tests/_helpers/TestHelper.php

@@ -0,0 +1,8 @@
+<?php
+namespace Codeception\Module;
+
+// here you can define custom functions for TestGuy 
+
+class TestHelper extends \Codeception\Module
+{
+}

apps/basic/tests/_helpers/WebHelper.php

@@ -0,0 +1,8 @@
+<?php
+namespace Codeception\Module;
+
+// here you can define custom functions for WebGuy 
+
+class WebHelper extends \Codeception\Module
+{
+}

apps/basic/tests/_log/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

apps/basic/tests/acceptance.suite.dist.yml

@@ -0,0 +1,18 @@
+# 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:
+        - PhpBrowser
+        - WebHelper
+    config:
+        PhpBrowser:
+            url: 'http://localhost/index-test.php'

apps/basic/tests/acceptance/AboutCept.php

@@ -0,0 +1,5 @@
+<?php
+$I = new WebGuy($scenario);
+$I->wantTo('ensure that about works');
+$I->amOnPage('?r=site/about');
+$I->see('About', 'h1');

apps/basic/tests/acceptance/ContactCept.php

@@ -0,0 +1,36 @@
+<?php
+$I = new WebGuy($scenario);
+$I->wantTo('ensure that contact works');
+$I->amOnPage('?r=site/contact');
+$I->see('Contact', 'h1');
+
+$I->submitForm('#contact-form', array());
+$I->see('Contact', 'h1');
+$I->see('Name cannot be blank');
+$I->see('Email cannot be blank');
+$I->see('Subject cannot be blank');
+$I->see('Body cannot be blank');
+$I->see('The verification code is incorrect');
+
+$I->submitForm('#contact-form', array(
+	'ContactForm[name]' => 'tester',
+	'ContactForm[email]' => 'tester.email',
+	'ContactForm[subject]' => 'test subject',
+	'ContactForm[body]' => 'test content',
+	'ContactForm[verifyCode]' => 'testme',
+));
+$I->dontSee('Name cannot be blank', '.help-inline');
+$I->see('Email is not a valid email address.');
+$I->dontSee('Subject cannot be blank', '.help-inline');
+$I->dontSee('Body cannot be blank', '.help-inline');
+$I->dontSee('The verification code is incorrect', '.help-inline');
+
+$I->submitForm('#contact-form', array(
+	'ContactForm[name]' => 'tester',
+	'ContactForm[email]' => 'tester@example.com',
+	'ContactForm[subject]' => 'test subject',
+	'ContactForm[body]' => 'test content',
+	'ContactForm[verifyCode]' => 'testme',
+));
+$I->dontSeeElement('#contact-form');
+$I->see('Thank you for contacting us. We will respond to you as soon as possible.');

apps/basic/tests/acceptance/HomeCept.php

@@ -0,0 +1,8 @@
+<?php
+$I = new WebGuy($scenario);
+$I->wantTo('ensure that home page works');
+$I->amOnPage('');
+$I->see('My Company');
+$I->seeLink('About');
+$I->click('About');
+$I->see('This is the About page.');

apps/basic/tests/acceptance/LoginCept.php

@@ -0,0 +1,23 @@
+<?php
+$I = new WebGuy($scenario);
+$I->wantTo('ensure that login works');
+$I->amOnPage('?r=site/login');
+$I->see('Login', 'h1');
+
+$I->submitForm('#login-form', array());
+$I->dontSee('Logout (admin)');
+$I->see('Username cannot be blank');
+$I->see('Password cannot be blank');
+
+$I->submitForm('#login-form', array(
+	'LoginForm[username]' => 'admin',
+	'LoginForm[password]' => 'wrong',
+));
+$I->dontSee('Logout (admin)');
+$I->see('Incorrect username or password');
+
+$I->submitForm('#login-form', array(
+	'LoginForm[username]' => 'admin',
+	'LoginForm[password]' => 'admin',
+));
+$I->see('Logout (admin)');

apps/basic/tests/acceptance/_bootstrap.php

@@ -0,0 +1,2 @@
+<?php
+// Here you can initialize variables that will for your tests

apps/basic/tests/functional.suite.dist.yml

@@ -0,0 +1,11 @@
+# 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.
+
+class_name: TestGuy
+modules:
+    enabled: [Filesystem, TestHelper]

apps/basic/tests/functional/TestGuy.php

@@ -0,0 +1,248 @@
+<?php
+// This class was automatically generated by build task
+// You can change it manually, but it will be overwritten on next build
+// @codingStandardsIgnoreFile
+
+use Codeception\Maybe;
+use Codeception\Module\Filesystem;
+use Codeception\Module\TestHelper;
+
+/**
+ * Inherited methods
+ * @method void wantToTest($text)
+ * @method void wantTo($text)
+ * @method void amTesting($method)
+ * @method void amTestingMethod($method)
+ * @method void testMethod($signature)
+ * @method void expectTo($prediction)
+ * @method void expect($prediction)
+ * @method void amGoingTo($argumentation)
+ * @method void am($role)
+ * @method void lookForwardTo($role)
+*/
+
+class TestGuy extends \Codeception\AbstractGuy
+{
+    
+    /**
+     * Enters a directory In local filesystem.
+     * Project root directory is used by default
+     *
+     * @param $path
+     * @see Filesystem::amInPath()
+     * @return \Codeception\Maybe
+     * ! This method is generated. DO NOT EDIT. !
+     * ! Documentation taken from corresponding module !
+     */
+    public function amInPath($path) {
+        $this->scenario->condition('amInPath', func_get_args());
+        if ($this->scenario->running()) {
+            $result = $this->scenario->runStep();
+            return new Maybe($result);
+        }
+        return new Maybe();
+    }
+
+ 
+    /**
+     * Opens a file and stores it's content.
+     *
+     * Usage:
+     *
+     * ``` php
+     * <?php
+     * $I->openFile('composer.json');
+     * $I->seeInThisFile('codeception/codeception');
+     * ?>
+     * ```
+     *
+     * @param $filename
+     * @see Filesystem::openFile()
+     * @return \Codeception\Maybe
+     * ! This method is generated. DO NOT EDIT. !
+     * ! Documentation taken from corresponding module !
+     */
+    public function openFile($filename) {
+        $this->scenario->action('openFile', func_get_args());
+        if ($this->scenario->running()) {
+            $result = $this->scenario->runStep();
+            return new Maybe($result);
+        }
+        return new Maybe();
+    }
+
+ 
+    /**
+     * Deletes a file
+     *
+     * ``` php
+     * <?php
+     * $I->deleteFile('composer.lock');
+     * ?>
+     * ```
+     *
+     * @param $filename
+     * @see Filesystem::deleteFile()
+     * @return \Codeception\Maybe
+     * ! This method is generated. DO NOT EDIT. !
+     * ! Documentation taken from corresponding module !
+     */
+    public function deleteFile($filename) {
+        $this->scenario->action('deleteFile', func_get_args());
+        if ($this->scenario->running()) {
+            $result = $this->scenario->runStep();
+            return new Maybe($result);
+        }
+        return new Maybe();
+    }
+
+ 
+    /**
+     * Deletes directory with all subdirectories
+     *
+     * ``` php
+     * <?php
+     * $I->deleteDir('vendor');
+     * ?>
+     * ```
+     *
+     * @param $dirname
+     * @see Filesystem::deleteDir()
+     * @return \Codeception\Maybe
+     * ! This method is generated. DO NOT EDIT. !
+     * ! Documentation taken from corresponding module !
+     */
+    public function deleteDir($dirname) {
+        $this->scenario->action('deleteDir', func_get_args());
+        if ($this->scenario->running()) {
+            $result = $this->scenario->runStep();
+            return new Maybe($result);
+        }
+        return new Maybe();
+    }
+
+ 
+    /**
+     * Copies directory with all contents
+     *
+     * ``` php
+     * <?php
+     * $I->copyDir('vendor','old_vendor');
+     * ?>
+     * ```
+     *
+     * @param $src
+     * @param $dst
+     * @see Filesystem::copyDir()
+     * @return \Codeception\Maybe
+     * ! This method is generated. DO NOT EDIT. !
+     * ! Documentation taken from corresponding module !
+     */
+    public function copyDir($src, $dst) {
+        $this->scenario->action('copyDir', func_get_args());
+        if ($this->scenario->running()) {
+            $result = $this->scenario->runStep();
+            return new Maybe($result);
+        }
+        return new Maybe();
+    }
+
+ 
+    /**
+     * Checks If opened file has `text` in it.
+     *
+     * Usage:
+     *
+     * ``` php
+     * <?php
+     * $I->openFile('composer.json');
+     * $I->seeInThisFile('codeception/codeception');
+     * ?>
+     * ```
+     *
+     * @param $text
+     * @see Filesystem::seeInThisFile()
+     * @return \Codeception\Maybe
+     * ! This method is generated. DO NOT EDIT. !
+     * ! Documentation taken from corresponding module !
+     */
+    public function seeInThisFile($text) {
+        $this->scenario->assertion('seeInThisFile', func_get_args());
+        if ($this->scenario->running()) {
+            $result = $this->scenario->runStep();
+            return new Maybe($result);
+        }
+        return new Maybe();
+    }
+
+ 
+    /**
+     * Checks If opened file doesn't contain `text` in it
+     *
+     * ``` php
+     * <?php
+     * $I->openFile('composer.json');
+     * $I->seeInThisFile('codeception/codeception');
+     * ?>
+     * ```
+     *
+     * @param $text
+     * @see Filesystem::dontSeeInThisFile()
+     * @return \Codeception\Maybe
+     * ! This method is generated. DO NOT EDIT. !
+     * ! Documentation taken from corresponding module !
+     */
+    public function dontSeeInThisFile($text) {
+        $this->scenario->action('dontSeeInThisFile', func_get_args());
+        if ($this->scenario->running()) {
+            $result = $this->scenario->runStep();
+            return new Maybe($result);
+        }
+        return new Maybe();
+    }
+
+ 
+    /**
+     * Deletes a file
+     * @see Filesystem::deleteThisFile()
+     * @return \Codeception\Maybe
+     * ! This method is generated. DO NOT EDIT. !
+     * ! Documentation taken from corresponding module !
+     */
+    public function deleteThisFile() {
+        $this->scenario->action('deleteThisFile', func_get_args());
+        if ($this->scenario->running()) {
+            $result = $this->scenario->runStep();
+            return new Maybe($result);
+        }
+        return new Maybe();
+    }
+
+ 
+    /**
+     * Checks if file exists in path.
+     * Opens a file when it's exists
+     *
+     * ``` php
+     * <?php
+     * $I->seeFileFound('UserModel.php','app/models');
+     * ?>
+     * ```
+     *
+     * @param $filename
+     * @param string $path
+     * @see Filesystem::seeFileFound()
+     * @return \Codeception\Maybe
+     * ! This method is generated. DO NOT EDIT. !
+     * ! Documentation taken from corresponding module !
+     */
+    public function seeFileFound($filename, $path = null) {
+        $this->scenario->assertion('seeFileFound', func_get_args());
+        if ($this->scenario->running()) {
+            $result = $this->scenario->runStep();
+            return new Maybe($result);
+        }
+        return new Maybe();
+    }
+}
+

apps/basic/tests/functional/_bootstrap.php

@@ -0,0 +1,2 @@
+<?php
+// Here you can initialize variables that will for your tests

apps/basic/tests/unit.suite.dist.yml

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

apps/basic/tests/unit/CodeGuy.php

@@ -0,0 +1,27 @@
+<?php
+// This class was automatically generated by build task
+// You can change it manually, but it will be overwritten on next build
+// @codingStandardsIgnoreFile
+
+use Codeception\Maybe;
+use Codeception\Module\CodeHelper;
+
+/**
+ * Inherited methods
+ * @method void wantToTest($text)
+ * @method void wantTo($text)
+ * @method void amTesting($method)
+ * @method void amTestingMethod($method)
+ * @method void testMethod($signature)
+ * @method void expectTo($prediction)
+ * @method void expect($prediction)
+ * @method void amGoingTo($argumentation)
+ * @method void am($role)
+ * @method void lookForwardTo($role)
+*/
+
+class CodeGuy extends \Codeception\AbstractGuy
+{
+    
+}
+

apps/basic/tests/unit/_bootstrap.php

@@ -0,0 +1,2 @@
+<?php
+// Here you can initialize variables that will for your tests

apps/basic/views/site/contact.php

@@ -24,7 +24,7 @@ $this->params['breadcrumbs'][] = $this->title;
 </p>
 
 <?php $form = ActiveForm::begin(array(
-	'options' => array('class' => 'form-horizontal'),
+	'options' => array('class' => 'form-horizontal', 'id' => 'contact-form'),
 	'fieldConfig' => array('inputOptions' => array('class' => 'input-xlarge')),
 )); ?>
 	<?php echo $form->field($model, 'name')->textInput(); ?>

apps/basic/views/site/login.php

@@ -14,7 +14,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
 <p>Please fill out the following fields to login:</p>
 
-<?php $form = ActiveForm::begin(array('options' => array('class' => 'form-horizontal'))); ?>
+<?php $form = ActiveForm::begin(array('options' => array('class' => 'form-horizontal', 'id' => 'login-form'))); ?>
 	<?php echo $form->field($model, 'username')->textInput(); ?>
 	<?php echo $form->field($model, 'password')->passwordInput(); ?>
 	<?php echo $form->field($model, 'rememberMe')->checkbox(); ?>

apps/basic/www/index-test.php

@@ -0,0 +1,17 @@
+<?php
+
+if (!in_array(@$_SERVER['REMOTE_ADDR'], array('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/yiisoft/yii2/yii/Yii.php');
+require(__DIR__ . '/../vendor/autoload.php');
+
+$config = require(__DIR__ . '/../config/web-test.php');
+
+$application = new yii\web\Application($config);
+$application->run();

apps/basic/www/index.php

@@ -6,7 +6,7 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
 require(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php');
 require(__DIR__ . '/../vendor/autoload.php');
 
-$config = require(__DIR__ . '/../config/main.php');
+$config = require(__DIR__ . '/../config/web.php');
 
 $application = new yii\web\Application($config);
 $application->run();

framework/yii/YiiBase.php

@@ -21,6 +21,11 @@ defined('YII_BEGIN_TIME') or define('YII_BEGIN_TIME', microtime(true));
  */
 defined('YII_DEBUG') or define('YII_DEBUG', false);
 /**
+ * This constant defines in which environment the application is running. Defaults to 'prod', meaning production environment.
+ * You may define this constant in the bootstrap script. The value could be 'prod' (production), 'dev' (development), 'test', 'staging', etc.
+ */
+defined('YII_ENV') or define('YII_ENV', 'prod');
+/**
  * This constant defines how much call stack information (file name and line number) should be logged by Yii::trace().
  * Defaults to 0, meaning no backtrace information. If it is greater than 0,
  * at most that number of call stacks will be logged. Note, only user application call stacks are considered.

framework/yii/web/CaptchaAction.php

@@ -87,7 +87,7 @@ class CaptchaAction extends Action
 	 */
 	public $fontFile = '@yii/web/SpicyRice.ttf';
 	/**
-	 * @var string the fixed verification code. When this is property is set,
+	 * @var string the fixed verification code. When this property is set,
 	 * [[getVerifyCode()]] will always return the value of this property.
 	 * This is mainly used in automated tests where we want to be able to reproduce
 	 * the same verification code each time we run the tests.