php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 06:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Makarov
2014-08-16 18:38:56 +04:00
parent cef430af01
commit c0a83142bf
9 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/advanced/tests/codeception/backend/_bootstrap.php
View File

@ -1,11 +1,12 @@
<?php <?php
defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');
defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__)))); 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/autoload.php');
require_once(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php'); require_once(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
require(ROOT_DIR . '/common/config/aliases.php'); require(ROOT_DIR . '/common/config/aliases.php');
@ -13,8 +14,8 @@ require(ROOT_DIR . '/common/config/aliases.php');
// set correct script paths // set correct script paths
// the entry script file path for functional and acceptance tests // the entry script file path for functional and acceptance tests
$_SERVER['SCRIPT_FILENAME'] = ROOT_DIR . '/backend/web/index-test.php'; $_SERVER['SCRIPT_FILENAME'] = BACKEND_ENTRY_FILE;
$_SERVER['SCRIPT_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url']; $_SERVER['SCRIPT_NAME'] = BACKEND_ENTRY_URL;
$_SERVER['SERVER_NAME'] = 'localhost'; $_SERVER['SERVER_NAME'] = 'localhost';
Yii::setAlias('@codeception', dirname(__DIR__)); Yii::setAlias('@codeception', dirname(__DIR__));

6
apps/advanced/tests/codeception/backend/functional/_config.php
View File

@ -1,8 +1,6 @@
<?php <?php
$_SERVER['SCRIPT_FILENAME'] = BACKEND_ENTRY_FILE;
// set correct script paths $_SERVER['SCRIPT_NAME'] = BACKEND_ENTRY_URL;
$_SERVER['SCRIPT_FILENAME'] = ROOT_DIR. '/backend/web/index-test.php';
$_SERVER['SCRIPT_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url'];;
return yii\helpers\ArrayHelper::merge( return yii\helpers\ArrayHelper::merge(
require(ROOT_DIR . '/backend/config/main.php'), require(ROOT_DIR . '/backend/config/main.php'),

2
apps/advanced/tests/codeception/common/_bootstrap.php
View File

@ -1,7 +1,5 @@
<?php <?php
defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');
defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__)))); defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__))));

2
apps/advanced/tests/codeception/console/_bootstrap.php
View File

@ -1,7 +1,5 @@
<?php <?php
defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');
defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__)))); defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__))));

9
apps/advanced/tests/codeception/frontend/_bootstrap.php
View File

@ -1,11 +1,12 @@
<?php <?php
defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'test'); defined('YII_ENV') or define('YII_ENV', 'test');
defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__)))); 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/autoload.php');
require_once(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php'); require_once(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
require(ROOT_DIR . '/common/config/aliases.php'); require(ROOT_DIR . '/common/config/aliases.php');
@ -13,8 +14,8 @@ require(ROOT_DIR . '/common/config/aliases.php');
// set correct script paths // set correct script paths
// the entry script file path for functional and acceptance tests // the entry script file path for functional and acceptance tests
$_SERVER['SCRIPT_FILENAME'] = ROOT_DIR . '/frontend/web/index-test.php'; $_SERVER['SCRIPT_FILENAME'] = FRONTEND_ENTRY_FILE;
$_SERVER['SCRIPT_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url']; $_SERVER['SCRIPT_NAME'] = FRONTEND_ENTRY_URL;
$_SERVER['SERVER_NAME'] = 'localhost'; $_SERVER['SERVER_NAME'] = 'localhost';
Yii::setAlias('@codeception', dirname(__DIR__)); Yii::setAlias('@codeception', dirname(__DIR__));

6
apps/advanced/tests/codeception/frontend/functional/_config.php
View File

@ -1,8 +1,6 @@
<?php <?php
$_SERVER['SCRIPT_FILENAME'] = FRONTEND_ENTRY_FILE;
// set correct script paths $_SERVER['SCRIPT_NAME'] = FRONTEND_ENTRY_URL;
$_SERVER['SCRIPT_FILENAME'] = ROOT_DIR . '/frontend/web/index-test.php';
$_SERVER['SCRIPT_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url'];;
return yii\helpers\ArrayHelper::merge( return yii\helpers\ArrayHelper::merge(
require(ROOT_DIR . '/frontend/config/main.php'), require(ROOT_DIR . '/frontend/config/main.php'),

4
apps/basic/tests/codeception.yml
View File

@ -10,3 +10,7 @@ settings:
memory_limit: 1024M memory_limit: 1024M
log: true log: true
colors: 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

14
apps/basic/tests/codeception/_bootstrap.php
View File

@ -1,21 +1,13 @@
<?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(dirname(__DIR__)) . '/web/index-test.php');
defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'test'); 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'); require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
// set correct script paths
$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE; $_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL; $_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
$_SERVER['SERVER_NAME'] = 'localhost'; $_SERVER['SERVER_NAME'] = 'localhost';

2
apps/basic/tests/codeception/functional/_config.php
View File

@ -1,6 +1,4 @@
<?php <?php
// set correct script paths
$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE; $_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL; $_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;