php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-02 04:37:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7082 from githubjeka/faker-config

Browse Source 
Move fixture configuration in config file
This commit is contained in:
Alexander Makarov
2015-01-29 17:27:29 +03:00
parent a6314c87a4 2ef29fadf5
commit 65844bf57d
4 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/advanced/tests/codeception/bin/yii
View File

@ -15,17 +15,7 @@ $config = yii\helpers\ArrayHelper::merge(
require(YII_APP_BASE_PATH . '/common/config/main-local.php'),
require(YII_APP_BASE_PATH . '/console/config/main.php'),
require(YII_APP_BASE_PATH . '/console/config/main-local.php'),
require(dirname(__DIR__) . '/config/config.php'),
[
'controllerMap' => [
'fixture' => [
'class' => 'yii\faker\FixtureController',
'fixtureDataPath' => '@tests/codeception/common/fixtures/data',
'templatePath' => '@tests/codeception/common/templates/fixtures',
'namespace' => 'tests\codeception\common\fixtures',
],
],
]
require(dirname(__DIR__) . '/config/config.php')
);
$application = new yii\console\Application($config);

8
apps/advanced/tests/codeception/config/config.php
View File

@ -3,6 +3,14 @@
* Application configuration shared by all applications and test types
*/
return [
'controllerMap' => [
'fixture' => [
'class' => 'yii\faker\FixtureController',
'fixtureDataPath' => '@tests/codeception/common/fixtures/data',
'templatePath' => '@tests/codeception/common/templates/fixtures',
'namespace' => 'tests\codeception\common\fixtures',
],
],
'components' => [
'db' => [
'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_tests',

12
apps/basic/tests/codeception/bin/yii
View File

@ -12,17 +12,7 @@ require_once __DIR__ . '/_bootstrap.php';
$config = yii\helpers\ArrayHelper::merge(
require(YII_APP_BASE_PATH . '/config/console.php'),
require(__DIR__ . '/../config/config.php'),
[
'controllerMap' => [
'fixture' => [
'class' => 'yii\faker\FixtureController',
'fixtureDataPath' => '@tests/codeception/fixtures',
'templatePath' => '@tests/codeception/templates',
'namespace' => 'tests\codeception\fixtures',
],
],
]
require(__DIR__ . '/../config/config.php')
);
$application = new yii\console\Application($config);

8
apps/basic/tests/codeception/config/config.php
View File

@ -3,6 +3,14 @@
* Application configuration shared by all test types
*/
return [
'controllerMap' => [
'fixture' => [
'class' => 'yii\faker\FixtureController',
'fixtureDataPath' => '@tests/codeception/fixtures',
'templatePath' => '@tests/codeception/templates',
'namespace' => 'tests\codeception\fixtures',
],
],
'components' => [
'db' => [
'dsn' => 'mysql:host=localhost;dbname=yii2_basic_tests',