From c0f116707f3acc69c28268be258f2f5e43f578da Mon Sep 17 00:00:00 2001
From: Evgeniy Tkachenko <e.jeka.mail@gmail.com>
Date: Thu, 29 Jan 2015 14:49:12 +0300
Subject: [PATCH] Move fixture configuration in config file

---
 apps/advanced/tests/codeception/bin/yii           | 12 +-----------
 apps/advanced/tests/codeception/config/config.php | 10 ++++++++++
 apps/basic/tests/codeception/bin/yii              | 12 +-----------
 apps/basic/tests/codeception/config/config.php    | 10 ++++++++++
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/apps/advanced/tests/codeception/bin/yii b/apps/advanced/tests/codeception/bin/yii
index ecdd8f695c..c4a1b52cbf 100644
--- a/apps/advanced/tests/codeception/bin/yii
+++ b/apps/advanced/tests/codeception/bin/yii
@@ -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);
diff --git a/apps/advanced/tests/codeception/config/config.php b/apps/advanced/tests/codeception/config/config.php
index 59e485a19b..e18ee3f18a 100644
--- a/apps/advanced/tests/codeception/config/config.php
+++ b/apps/advanced/tests/codeception/config/config.php
@@ -3,6 +3,16 @@
  * 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',
diff --git a/apps/basic/tests/codeception/bin/yii b/apps/basic/tests/codeception/bin/yii
index c7f2653ff1..c6df160d82 100644
--- a/apps/basic/tests/codeception/bin/yii
+++ b/apps/basic/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/apps/basic/tests/codeception/config/config.php b/apps/basic/tests/codeception/config/config.php
index bac901d630..e949051f26 100644
--- a/apps/basic/tests/codeception/config/config.php
+++ b/apps/basic/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',