From d0d066faad37cb5258b75b9e40c1c21eddc2a952 Mon Sep 17 00:00:00 2001 From: Evgeniy Tkachenko Date: Thu, 29 Jan 2015 14:49:12 +0300 Subject: [PATCH] Move fixture configuration in config file --- tests/codeception/bin/yii | 12 +----------- tests/codeception/config/config.php | 10 ++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/codeception/bin/yii b/tests/codeception/bin/yii index c7f2653..c6df160 100644 --- a/tests/codeception/bin/yii +++ b/tests/codeception/bin/yii @@ -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); diff --git a/tests/codeception/config/config.php b/tests/codeception/config/config.php index bac901d..e949051 100644 --- a/tests/codeception/config/config.php +++ b/tests/codeception/config/config.php @@ -3,6 +3,16 @@ * 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',