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