From 545a908b539e7b183d5eb301dd030511ad03da22 Mon Sep 17 00:00:00 2001
From: Anton Andersen <trianman@gmail.com>
Date: Sun, 3 Aug 2014 22:04:03 +0400
Subject: [PATCH 1/3] Add runner for all tests

---
 apps/advanced/codeception.yml       | 11 +++++++++++
 apps/advanced/tests/_log/.gitignore |  2 ++
 2 files changed, 13 insertions(+)
 create mode 100644 apps/advanced/codeception.yml
 create mode 100644 apps/advanced/tests/_log/.gitignore

diff --git a/apps/advanced/codeception.yml b/apps/advanced/codeception.yml
new file mode 100644
index 0000000000..c94b9fde94
--- /dev/null
+++ b/apps/advanced/codeception.yml
@@ -0,0 +1,11 @@
+include:
+  - common
+  - console
+  - backend
+  - frontend
+
+paths:
+  log: tests/_log
+
+settings:
+  colors: true
diff --git a/apps/advanced/tests/_log/.gitignore b/apps/advanced/tests/_log/.gitignore
new file mode 100644
index 0000000000..d6b7ef32c8
--- /dev/null
+++ b/apps/advanced/tests/_log/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore

From 71adca60eeae3315030c3aaa7cb988f89fc4e6e2 Mon Sep 17 00:00:00 2001
From: Anton Andersen <trianman@gmail.com>
Date: Sun, 3 Aug 2014 22:04:55 +0400
Subject: [PATCH 2/3] Add namespaces to all tests

---
 apps/advanced/backend/codeception.yml                   | 1 +
 apps/advanced/backend/tests/acceptance/LoginCept.php    | 1 +
 apps/advanced/backend/tests/functional/LoginCept.php    | 1 +
 apps/advanced/common/codeception.yml                    | 1 +
 apps/advanced/console/codeception.yml                   | 1 +
 apps/advanced/frontend/codeception.yml                  | 1 +
 apps/advanced/frontend/tests/acceptance/AboutCept.php   | 1 +
 apps/advanced/frontend/tests/acceptance/ContactCept.php | 1 +
 apps/advanced/frontend/tests/acceptance/HomeCept.php    | 2 ++
 apps/advanced/frontend/tests/acceptance/LoginCept.php   | 1 +
 apps/advanced/frontend/tests/functional/AboutCept.php   | 1 +
 apps/advanced/frontend/tests/functional/ContactCept.php | 1 +
 apps/advanced/frontend/tests/functional/HomeCept.php    | 2 ++
 apps/advanced/frontend/tests/functional/LoginCept.php   | 1 +
 14 files changed, 16 insertions(+)

diff --git a/apps/advanced/backend/codeception.yml b/apps/advanced/backend/codeception.yml
index 6d2019c859..b873ade13f 100644
--- a/apps/advanced/backend/codeception.yml
+++ b/apps/advanced/backend/codeception.yml
@@ -1,3 +1,4 @@
+namespace: backend
 actor: Tester
 paths:
     tests: tests
diff --git a/apps/advanced/backend/tests/acceptance/LoginCept.php b/apps/advanced/backend/tests/acceptance/LoginCept.php
index fddcf87f09..327b466d52 100644
--- a/apps/advanced/backend/tests/acceptance/LoginCept.php
+++ b/apps/advanced/backend/tests/acceptance/LoginCept.php
@@ -1,6 +1,7 @@
 <?php
 
 use common\tests\_pages\LoginPage;
+use backend\WebGuy;
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure login page works');
diff --git a/apps/advanced/backend/tests/functional/LoginCept.php b/apps/advanced/backend/tests/functional/LoginCept.php
index 3c347b7c43..5bba9594a7 100644
--- a/apps/advanced/backend/tests/functional/LoginCept.php
+++ b/apps/advanced/backend/tests/functional/LoginCept.php
@@ -1,6 +1,7 @@
 <?php
 
 use common\tests\_pages\LoginPage;
+use backend\TestGuy;
 
 $I = new TestGuy($scenario);
 $I->wantTo('ensure login page works');
diff --git a/apps/advanced/common/codeception.yml b/apps/advanced/common/codeception.yml
index 6d2019c859..4ee15239c3 100644
--- a/apps/advanced/common/codeception.yml
+++ b/apps/advanced/common/codeception.yml
@@ -1,3 +1,4 @@
+namespace: common
 actor: Tester
 paths:
     tests: tests
diff --git a/apps/advanced/console/codeception.yml b/apps/advanced/console/codeception.yml
index 6d2019c859..94a12e3570 100644
--- a/apps/advanced/console/codeception.yml
+++ b/apps/advanced/console/codeception.yml
@@ -1,3 +1,4 @@
+namespace: console
 actor: Tester
 paths:
     tests: tests
diff --git a/apps/advanced/frontend/codeception.yml b/apps/advanced/frontend/codeception.yml
index 6d2019c859..145c3db57f 100644
--- a/apps/advanced/frontend/codeception.yml
+++ b/apps/advanced/frontend/codeception.yml
@@ -1,3 +1,4 @@
+namespace: frontend
 actor: Tester
 paths:
     tests: tests
diff --git a/apps/advanced/frontend/tests/acceptance/AboutCept.php b/apps/advanced/frontend/tests/acceptance/AboutCept.php
index 71e387c82e..e8d17b2174 100644
--- a/apps/advanced/frontend/tests/acceptance/AboutCept.php
+++ b/apps/advanced/frontend/tests/acceptance/AboutCept.php
@@ -1,6 +1,7 @@
 <?php
 
 use frontend\tests\_pages\AboutPage;
+use frontend\WebGuy;
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure that about works');
diff --git a/apps/advanced/frontend/tests/acceptance/ContactCept.php b/apps/advanced/frontend/tests/acceptance/ContactCept.php
index b8492cdc65..5a36e1d5f3 100644
--- a/apps/advanced/frontend/tests/acceptance/ContactCept.php
+++ b/apps/advanced/frontend/tests/acceptance/ContactCept.php
@@ -1,6 +1,7 @@
 <?php
 
 use frontend\tests\_pages\ContactPage;
+use frontend\WebGuy;
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure that contact works');
diff --git a/apps/advanced/frontend/tests/acceptance/HomeCept.php b/apps/advanced/frontend/tests/acceptance/HomeCept.php
index 62456f930e..4f5cc19966 100644
--- a/apps/advanced/frontend/tests/acceptance/HomeCept.php
+++ b/apps/advanced/frontend/tests/acceptance/HomeCept.php
@@ -1,5 +1,7 @@
 <?php
 
+use frontend\WebGuy;
+
 $I = new WebGuy($scenario);
 $I->wantTo('ensure that home page works');
 $I->amOnPage(Yii::$app->homeUrl);
diff --git a/apps/advanced/frontend/tests/acceptance/LoginCept.php b/apps/advanced/frontend/tests/acceptance/LoginCept.php
index fddcf87f09..3728baff1d 100644
--- a/apps/advanced/frontend/tests/acceptance/LoginCept.php
+++ b/apps/advanced/frontend/tests/acceptance/LoginCept.php
@@ -1,6 +1,7 @@
 <?php
 
 use common\tests\_pages\LoginPage;
+use frontend\WebGuy;
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure login page works');
diff --git a/apps/advanced/frontend/tests/functional/AboutCept.php b/apps/advanced/frontend/tests/functional/AboutCept.php
index b2153b3c1f..f9dd1a5a03 100644
--- a/apps/advanced/frontend/tests/functional/AboutCept.php
+++ b/apps/advanced/frontend/tests/functional/AboutCept.php
@@ -1,6 +1,7 @@
 <?php
 
 use frontend\tests\_pages\AboutPage;
+use frontend\TestGuy;
 
 $I = new TestGuy($scenario);
 $I->wantTo('ensure that about works');
diff --git a/apps/advanced/frontend/tests/functional/ContactCept.php b/apps/advanced/frontend/tests/functional/ContactCept.php
index c08e8e0c4b..774428c8bd 100644
--- a/apps/advanced/frontend/tests/functional/ContactCept.php
+++ b/apps/advanced/frontend/tests/functional/ContactCept.php
@@ -1,6 +1,7 @@
 <?php
 
 use frontend\tests\_pages\ContactPage;
+use frontend\TestGuy;
 
 $I = new TestGuy($scenario);
 $I->wantTo('ensure that contact works');
diff --git a/apps/advanced/frontend/tests/functional/HomeCept.php b/apps/advanced/frontend/tests/functional/HomeCept.php
index 3258ba3331..1bc1d5b6ea 100644
--- a/apps/advanced/frontend/tests/functional/HomeCept.php
+++ b/apps/advanced/frontend/tests/functional/HomeCept.php
@@ -1,5 +1,7 @@
 <?php
 
+use frontend\TestGuy;
+
 $I = new TestGuy($scenario);
 $I->wantTo('ensure that home page works');
 $I->amOnPage(Yii::$app->homeUrl);
diff --git a/apps/advanced/frontend/tests/functional/LoginCept.php b/apps/advanced/frontend/tests/functional/LoginCept.php
index 3c347b7c43..7e1e1be508 100644
--- a/apps/advanced/frontend/tests/functional/LoginCept.php
+++ b/apps/advanced/frontend/tests/functional/LoginCept.php
@@ -1,6 +1,7 @@
 <?php
 
 use common\tests\_pages\LoginPage;
+use frontend\TestGuy;
 
 $I = new TestGuy($scenario);
 $I->wantTo('ensure login page works');

From dfffea9af36e56def401a44c05171a6324a365c8 Mon Sep 17 00:00:00 2001
From: Anton Andersen <trianman@gmail.com>
Date: Mon, 11 Aug 2014 12:39:47 +0400
Subject: [PATCH 3/3] Use config variables instead constants. Cleanup redundant
 constants

---
 apps/advanced/README.md                             |  4 +++-
 apps/advanced/backend/codeception.yml               |  4 ++++
 apps/advanced/backend/tests/_bootstrap.php          | 13 ++++---------
 apps/advanced/backend/tests/functional/_config.php  |  4 ++--
 apps/advanced/common/tests/_bootstrap.php           |  9 ---------
 apps/advanced/console/tests/_bootstrap.php          |  9 ---------
 apps/advanced/frontend/codeception.yml              |  4 ++++
 apps/advanced/frontend/tests/_bootstrap.php         | 13 ++++---------
 apps/advanced/frontend/tests/functional/_config.php |  4 ++--
 9 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/apps/advanced/README.md b/apps/advanced/README.md
index b1d7351059..508a4140bd 100644
--- a/apps/advanced/README.md
+++ b/apps/advanced/README.md
@@ -113,7 +113,7 @@ 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 `frontend/tests/_bootstrap.php` and `backend/tests/_bootstrap.php`.
+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:
 
@@ -123,5 +123,7 @@ After that is done you should be able to run your tests, for example to run `fro
 
 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.
diff --git a/apps/advanced/backend/codeception.yml b/apps/advanced/backend/codeception.yml
index b873ade13f..49a978b6dc 100644
--- a/apps/advanced/backend/codeception.yml
+++ b/apps/advanced/backend/codeception.yml
@@ -18,3 +18,7 @@ modules:
             user: ''
             password: ''
             dump: tests/_data/dump.sql
+config:
+    # the entry script URL (without host info) for functional and acceptance tests
+    # PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
+    test_entry_url: /advanced/backend/web/index-test.php
diff --git a/apps/advanced/backend/tests/_bootstrap.php b/apps/advanced/backend/tests/_bootstrap.php
index 76f6348cea..bc9d17c28a 100644
--- a/apps/advanced/backend/tests/_bootstrap.php
+++ b/apps/advanced/backend/tests/_bootstrap.php
@@ -1,12 +1,5 @@
 <?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', '/advanced/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');
@@ -18,6 +11,8 @@ 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;
+
+// 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';
diff --git a/apps/advanced/backend/tests/functional/_config.php b/apps/advanced/backend/tests/functional/_config.php
index ba776b6169..15d3100cfc 100644
--- a/apps/advanced/backend/tests/functional/_config.php
+++ b/apps/advanced/backend/tests/functional/_config.php
@@ -1,8 +1,8 @@
 <?php
 
 // set correct script paths
-$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
-$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
+$_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'),
diff --git a/apps/advanced/common/tests/_bootstrap.php b/apps/advanced/common/tests/_bootstrap.php
index c64ad3be72..15b36bc2d2 100644
--- a/apps/advanced/common/tests/_bootstrap.php
+++ b/apps/advanced/common/tests/_bootstrap.php
@@ -1,12 +1,5 @@
 <?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');
@@ -18,6 +11,4 @@ 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';
diff --git a/apps/advanced/console/tests/_bootstrap.php b/apps/advanced/console/tests/_bootstrap.php
index c64ad3be72..15b36bc2d2 100644
--- a/apps/advanced/console/tests/_bootstrap.php
+++ b/apps/advanced/console/tests/_bootstrap.php
@@ -1,12 +1,5 @@
 <?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');
@@ -18,6 +11,4 @@ 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';
diff --git a/apps/advanced/frontend/codeception.yml b/apps/advanced/frontend/codeception.yml
index 145c3db57f..7fa2a38f83 100644
--- a/apps/advanced/frontend/codeception.yml
+++ b/apps/advanced/frontend/codeception.yml
@@ -18,3 +18,7 @@ modules:
             user: ''
             password: ''
             dump: tests/_data/dump.sql
+config:
+    # the entry script URL (without host info) for functional and acceptance tests
+    # PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
+    test_entry_url: /advanced/frontend/web/index-test.php
diff --git a/apps/advanced/frontend/tests/_bootstrap.php b/apps/advanced/frontend/tests/_bootstrap.php
index 3e271459db..bc9d17c28a 100644
--- a/apps/advanced/frontend/tests/_bootstrap.php
+++ b/apps/advanced/frontend/tests/_bootstrap.php
@@ -1,12 +1,5 @@
 <?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', '/advanced/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');
@@ -18,6 +11,8 @@ 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;
+
+// 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';
diff --git a/apps/advanced/frontend/tests/functional/_config.php b/apps/advanced/frontend/tests/functional/_config.php
index ba776b6169..15d3100cfc 100644
--- a/apps/advanced/frontend/tests/functional/_config.php
+++ b/apps/advanced/frontend/tests/functional/_config.php
@@ -1,8 +1,8 @@
 <?php
 
 // set correct script paths
-$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
-$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
+$_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'),