From c0a83142bfcb030becb6b8b2a614fd8483fbd5c5 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 16 Aug 2014 18:38:56 +0400
Subject: [PATCH] Exposed basic app entry URL via codeception.yml, refactored
 configs of advanced app to read from config and define entry script in a
 single place

---
 .../tests/codeception/backend/_bootstrap.php       |  9 +++++----
 .../codeception/backend/functional/_config.php     |  6 ++----
 .../tests/codeception/common/_bootstrap.php        |  2 --
 .../tests/codeception/console/_bootstrap.php       |  2 --
 .../tests/codeception/frontend/_bootstrap.php      |  9 +++++----
 .../codeception/frontend/functional/_config.php    |  6 ++----
 apps/basic/tests/codeception.yml                   |  4 ++++
 apps/basic/tests/codeception/_bootstrap.php        | 14 +++-----------
 .../basic/tests/codeception/functional/_config.php |  2 --
 9 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/apps/advanced/tests/codeception/backend/_bootstrap.php b/apps/advanced/tests/codeception/backend/_bootstrap.php
index eff0d345bf..2833fe277d 100644
--- a/apps/advanced/tests/codeception/backend/_bootstrap.php
+++ b/apps/advanced/tests/codeception/backend/_bootstrap.php
@@ -1,11 +1,12 @@
 <?php
-
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-
 defined('YII_ENV') or define('YII_ENV', 'test');
 
 defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__))));
 
+defined('BACKEND_ENTRY_URL') or define('BACKEND_ENTRY_URL', \Codeception\Configuration::config()['config']['test_entry_url']);
+defined('BACKEND_ENTRY_FILE') or define('BACKEND_ENTRY_FILE', ROOT_DIR . '/backend/web/index-test.php');
+
 require_once(ROOT_DIR . '/vendor/autoload.php');
 require_once(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
 require(ROOT_DIR . '/common/config/aliases.php');
@@ -13,8 +14,8 @@ require(ROOT_DIR . '/common/config/aliases.php');
 // set correct script paths
 
 // the entry script file path for functional and acceptance tests
-$_SERVER['SCRIPT_FILENAME'] = ROOT_DIR . '/backend/web/index-test.php';
-$_SERVER['SCRIPT_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url'];
+$_SERVER['SCRIPT_FILENAME'] = BACKEND_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = BACKEND_ENTRY_URL;
 $_SERVER['SERVER_NAME'] = 'localhost';
 
 Yii::setAlias('@codeception', dirname(__DIR__));
diff --git a/apps/advanced/tests/codeception/backend/functional/_config.php b/apps/advanced/tests/codeception/backend/functional/_config.php
index 28a7905af4..6d4bf7cecb 100644
--- a/apps/advanced/tests/codeception/backend/functional/_config.php
+++ b/apps/advanced/tests/codeception/backend/functional/_config.php
@@ -1,8 +1,6 @@
 <?php
-
-// set correct script paths
-$_SERVER['SCRIPT_FILENAME'] = ROOT_DIR. '/backend/web/index-test.php';
-$_SERVER['SCRIPT_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url'];;
+$_SERVER['SCRIPT_FILENAME'] = BACKEND_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = BACKEND_ENTRY_URL;
 
 return yii\helpers\ArrayHelper::merge(
     require(ROOT_DIR . '/backend/config/main.php'),
diff --git a/apps/advanced/tests/codeception/common/_bootstrap.php b/apps/advanced/tests/codeception/common/_bootstrap.php
index 97053d97fb..2225ef0519 100644
--- a/apps/advanced/tests/codeception/common/_bootstrap.php
+++ b/apps/advanced/tests/codeception/common/_bootstrap.php
@@ -1,7 +1,5 @@
 <?php
-
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-
 defined('YII_ENV') or define('YII_ENV', 'test');
 
 defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__))));
diff --git a/apps/advanced/tests/codeception/console/_bootstrap.php b/apps/advanced/tests/codeception/console/_bootstrap.php
index 97053d97fb..2225ef0519 100644
--- a/apps/advanced/tests/codeception/console/_bootstrap.php
+++ b/apps/advanced/tests/codeception/console/_bootstrap.php
@@ -1,7 +1,5 @@
 <?php
-
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-
 defined('YII_ENV') or define('YII_ENV', 'test');
 
 defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__))));
diff --git a/apps/advanced/tests/codeception/frontend/_bootstrap.php b/apps/advanced/tests/codeception/frontend/_bootstrap.php
index d29eba949f..a6aa22b27b 100644
--- a/apps/advanced/tests/codeception/frontend/_bootstrap.php
+++ b/apps/advanced/tests/codeception/frontend/_bootstrap.php
@@ -1,11 +1,12 @@
 <?php
-
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-
 defined('YII_ENV') or define('YII_ENV', 'test');
 
 defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__))));
 
+defined('FRONTEND_ENTRY_URL') or define('FRONTEND_ENTRY_URL', \Codeception\Configuration::config()['config']['test_entry_url']);
+defined('FRONTEND_ENTRY_FILE') or define('FRONTEND_ENTRY_FILE', ROOT_DIR . '/frontend/web/index-test.php');
+
 require_once(ROOT_DIR . '/vendor/autoload.php');
 require_once(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
 require(ROOT_DIR . '/common/config/aliases.php');
@@ -13,8 +14,8 @@ require(ROOT_DIR . '/common/config/aliases.php');
 // set correct script paths
 
 // the entry script file path for functional and acceptance tests
-$_SERVER['SCRIPT_FILENAME'] = ROOT_DIR . '/frontend/web/index-test.php';
-$_SERVER['SCRIPT_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url'];
+$_SERVER['SCRIPT_FILENAME'] = FRONTEND_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = FRONTEND_ENTRY_URL;
 $_SERVER['SERVER_NAME'] = 'localhost';
 
 Yii::setAlias('@codeception', dirname(__DIR__));
\ No newline at end of file
diff --git a/apps/advanced/tests/codeception/frontend/functional/_config.php b/apps/advanced/tests/codeception/frontend/functional/_config.php
index 0c989e6f86..036926faf5 100644
--- a/apps/advanced/tests/codeception/frontend/functional/_config.php
+++ b/apps/advanced/tests/codeception/frontend/functional/_config.php
@@ -1,8 +1,6 @@
 <?php
-
-// set correct script paths
-$_SERVER['SCRIPT_FILENAME'] = ROOT_DIR . '/frontend/web/index-test.php';
-$_SERVER['SCRIPT_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url'];;
+$_SERVER['SCRIPT_FILENAME'] = FRONTEND_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = FRONTEND_ENTRY_URL;
 
 return yii\helpers\ArrayHelper::merge(
     require(ROOT_DIR . '/frontend/config/main.php'),
diff --git a/apps/basic/tests/codeception.yml b/apps/basic/tests/codeception.yml
index 851923d16f..ba02c81b77 100644
--- a/apps/basic/tests/codeception.yml
+++ b/apps/basic/tests/codeception.yml
@@ -10,3 +10,7 @@ settings:
     memory_limit: 1024M
     log: true
     colors: true
+config:
+    # the entry script URL (without host info) for functional and acceptance tests
+    # PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
+    test_entry_url: /index-test.php
\ No newline at end of file
diff --git a/apps/basic/tests/codeception/_bootstrap.php b/apps/basic/tests/codeception/_bootstrap.php
index ecd76de938..eb61f8f644 100644
--- a/apps/basic/tests/codeception/_bootstrap.php
+++ b/apps/basic/tests/codeception/_bootstrap.php
@@ -1,21 +1,13 @@
 <?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(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');
+defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', \Codeception\Configuration::config()['config']['test_entry_url']);
+defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(dirname(__DIR__)) . '/web/index-test.php');
 
+require_once(__DIR__ . '/../../vendor/autoload.php');
 require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.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/basic/tests/codeception/functional/_config.php b/apps/basic/tests/codeception/functional/_config.php
index 3d50fdbaf0..515c90487b 100644
--- a/apps/basic/tests/codeception/functional/_config.php
+++ b/apps/basic/tests/codeception/functional/_config.php
@@ -1,6 +1,4 @@
 <?php
-
-// set correct script paths
 $_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
 $_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;