Skip to content

Y
yii2
Commit 0766ddca by Qiang Xue
Options

Fixes #1701.

parent c88016f9
Showing with 58 additions and 48 deletions
apps/basic/config/web.php
...@@ -47,11 +47,4 @@ if (YII_ENV_DEV) { ...@@ -47,11 +47,4 @@ if (YII_ENV_DEV) {
$config['modules']['gii'] = 'yii\gii\Module'; $config['modules']['gii'] = 'yii\gii\Module';
} }
if (YII_ENV_TEST) {
// configuration adjustments for 'test' environment.
// configuration for codeception test environments can be found in codeception folder.
// if needed, customize $config here.
}
return $config; return $config;
apps/basic/tests/_bootstrap.php
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// the entry script URL (without host info) for functional and acceptance tests // the entry script URL (without host info) for functional and acceptance tests
// PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL // PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', '/yii2-basic/web/index-test.php'); defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', '/basic/web/index-test.php');
// the entry script file path for functional and acceptance tests // 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('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(__DIR__) . '/web/index-test.php');
......
apps/basic/tests/_config.php 0 → 100644
<?php
/**
* application configurations shared by all test types
*/
return [
'components' => [
'mail' => [
'useFileTransport' => true,
],
],
];
apps/basic/tests/acceptance/_config.php
<?php <?php
use yii\helpers\ArrayHelper; return yii\helpers\ArrayHelper::merge(
require(__DIR__ . '/../../config/web.php'),
$config = require(__DIR__ . '/../../config/web.php'); require(__DIR__ . '/../_config.php'),
[
return ArrayHelper::merge($config, [ 'components' => [
'components' => [ 'db' => [
'db' => [ 'dsn' => 'mysql:host=localhost;dbname=yii2_basic_acceptance',
'dsn' => 'mysql:host=localhost;dbname=yii2_basic_acceptance', ],
], 'mail' => [
'urlManager' => [ 'useFileTransport' => true,
'showScriptName' => true, ],
'urlManager' => [
'showScriptName' => true,
],
], ],
], ]
]); );
apps/basic/tests/functional/_config.php
<?php <?php
use yii\helpers\ArrayHelper;
// set correct script paths // 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;
$config = require(__DIR__ . '/../../config/web.php'); return yii\helpers\ArrayHelper::merge(
require(__DIR__ . '/../../config/web.php'),
return ArrayHelper::merge($config, [ require(__DIR__ . '/../_config.php'),
'components' => [ [
'db' => [ 'components' => [
'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional', 'db' => [
], 'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional',
'urlManager' => [ ],
'showScriptName' => true, 'mail' => [
'useFileTransport' => true,
],
'urlManager' => [
'showScriptName' => true,
],
], ],
], ]
]); );
apps/basic/tests/unit/_config.php
<?php <?php
use yii\helpers\ArrayHelper; return yii\helpers\ArrayHelper::merge(
require(__DIR__ . '/../../config/web.php'),
$config = require(__DIR__ . '/../../config/web.php'); require(__DIR__ . '/../_config.php'),
[
return ArrayHelper::merge($config, [ 'components' => [
'components' => [ 'fixture' => [
'fixture' => [ 'class' => 'yii\test\DbFixtureManager',
'class' => 'yii\test\DbFixtureManager', 'basePath' => '@tests/unit/fixtures',
'basePath' => '@tests/unit/fixtures', ],
], 'db' => [
'db' => [ 'dsn' => 'mysql:host=localhost;dbname=yii2_basic_unit',
'dsn' => 'mysql:host=localhost;dbname=yii2_basic_unit', ],
], ],
], ]
]); );
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment