chenx221/yii2-netdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixes #1701.

Browse Source
This commit is contained in:
Qiang Xue 2013-12-30 09:22:18 -05:00
parent 4a63061213
commit 905e8ea4bc
6 changed files with 58 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/web.php
View File

@ -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;

2
tests/_bootstrap.php
View File

@ -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');

11
tests/_config.php Normal file
View File

@ -0,0 +1,11 @@
<?php
/**
* application configurations shared by all test types
*/
return [
'components' => [
'mail' => [
'useFileTransport' => true,
],
],
];

15
tests/acceptance/_config.php
View File

@ -1,16 +1,19 @@
<?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' => [
'useFileTransport' => true,
],
'urlManager' => [ 'urlManager' => [
'showScriptName' => true, 'showScriptName' => true,
], ],
], ],
]); ]
);

15
tests/functional/_config.php
View File

@ -1,20 +1,23 @@
<?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' => [ 'components' => [
'db' => [ 'db' => [
'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional', 'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional',
], ],
'mail' => [
'useFileTransport' => true,
],
'urlManager' => [ 'urlManager' => [
'showScriptName' => true, 'showScriptName' => true,
], ],
], ],
]); ]
);

12
tests/unit/_config.php
View File

@ -1,10 +1,9 @@
<?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',
@ -14,4 +13,5 @@ return ArrayHelper::merge($config, [
'dsn' => 'mysql:host=localhost;dbname=yii2_basic_unit', 'dsn' => 'mysql:host=localhost;dbname=yii2_basic_unit',
], ],
], ],
]); ]
);