Adjusted test configs structure

apps/advanced/tests/codeception/backend/acceptance/_bootstrap.php

@@ -1,3 +1,2 @@
 <?php
-
-new yii\web\Application(require(__DIR__ . '/_config.php'));
+new yii\web\Application(require(dirname(dirname(__DIR__)) . '/config/backend/acceptance.php'));

apps/advanced/tests/codeception/backend/functional.suite.yml

@@ -14,4 +14,4 @@ modules:
       - codeception\common\_support\FixtureHelper
     config:
         Yii2:
-            configFile: 'functional/_config.php'
+            configFile: '../config/backend/functional.php'

apps/advanced/tests/codeception/backend/functional/_bootstrap.php

@@ -1,3 +1,2 @@
 <?php
-
-new yii\web\Application(require(__DIR__ . '/_config.php'));
+new yii\web\Application(require(dirname(dirname(__DIR__)) . '/config/backend/functional.php'));

apps/advanced/tests/codeception/backend/unit/DbTestCase.php

@@ -4,5 +4,5 @@ namespace backend\tests\unit;
 
 class DbTestCase extends \yii\codeception\DbTestCase
 {
-    public $appConfig = '@backend/tests/unit/_config.php';
+    public $appConfig = '@codeception/config/backend/unit.php';
 }

apps/advanced/tests/codeception/backend/unit/TestCase.php

@@ -4,5 +4,5 @@ namespace backend\tests\unit;
 
 class TestCase extends \yii\codeception\TestCase
 {
-    public $appConfig = '@backend/tests/unit/_config.php';
+    public $appConfig = '@codeception/config/backend/unit.php';
 }

apps/advanced/tests/codeception/bin/yii_acceptance

@@ -8,19 +8,15 @@
  * @license http://www.yiiframework.com/license/
  */
 
-require_once __DIR__ . '/_console_bootstrap.php';
+require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
     require(ROOT_DIR . '/common/config/main.php'),
     require(ROOT_DIR . '/common/config/main-local.php'),
     require(ROOT_DIR . '/console/config/main.php'),
     require(ROOT_DIR . '/console/config/main-local.php'),
+    require(dirname(__DIR__) . '/config/acceptance.php'),
     [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_acceptance',
-            ],
-        ],
         'controllerMap' => [
             'fixture' => [
                 'class' => 'yii\faker\FixtureController',

apps/advanced/tests/codeception/bin/yii_functional

@@ -8,19 +8,15 @@
  * @license http://www.yiiframework.com/license/
  */
 
-require_once __DIR__ . '/_console_bootstrap.php';
+require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
     require(ROOT_DIR . '/common/config/main.php'),
     require(ROOT_DIR . '/common/config/main-local.php'),
     require(ROOT_DIR . '/console/config/main.php'),
     require(ROOT_DIR . '/console/config/main-local.php'),
+    require(dirname(__DIR__) . '/config/functional.php'),
     [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_functional',
-            ],
-        ],
         'controllerMap' => [
             'fixture' => [
                 'class' => 'yii\faker\FixtureController',

apps/advanced/tests/codeception/bin/yii_unit

@@ -8,19 +8,15 @@
  * @license http://www.yiiframework.com/license/
  */
 
-require_once __DIR__ . '/_console_bootstrap.php';
+require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
     require(ROOT_DIR . '/common/config/main.php'),
     require(ROOT_DIR . '/common/config/main-local.php'),
     require(ROOT_DIR . '/console/config/main.php'),
     require(ROOT_DIR . '/console/config/main-local.php'),
+    require(dirname(__DIR__) . '/config/unit.php'),
     [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_unit',
-            ],
-        ],
         'controllerMap' => [
             'fixture' => [
                 'class' => 'yii\faker\FixtureController',

apps/advanced/tests/codeception/common/unit/DbTestCase.php

@@ -7,5 +7,5 @@ namespace codeception\common\unit;
  */
 class DbTestCase extends \yii\codeception\DbTestCase
 {
-    public $appConfig = '@codeception/common/unit/_config.php';
+    public $appConfig = '@codeception/config/common/unit.php';
 }

apps/advanced/tests/codeception/common/unit/TestCase.php

@@ -7,5 +7,5 @@ namespace common\tests\unit;
  */
 class TestCase extends \yii\codeception\TestCase
 {
-    public $appConfig = '@common/tests/unit/_config.php';
+    public $appConfig = '@codeception/config/common/unit.php';
 }

apps/advanced/tests/codeception/config/acceptance.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ * Application configuration shared by all applications acceptance tests
+ */
+return [
+    'components' => [
+        'db' => [
+            'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_acceptance',
+        ],
+    ],
+];

apps/advanced/tests/codeception/config/backend/acceptance.php

@@ -1,16 +1,13 @@
 <?php
 defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(dirname(__DIR__)))));
 return yii\helpers\ArrayHelper::merge(
-    require(ROOT_DIR . '/backend/config/main.php'),
-    require(ROOT_DIR . '/backend/config/main-local.php'),
     require(ROOT_DIR . '/common/config/main.php'),
     require(ROOT_DIR . '/common/config/main-local.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(ROOT_DIR . '/backend/config/main.php'),
+    require(ROOT_DIR . '/backend/config/main-local.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/acceptance.php'),
+    require(__DIR__ . '/config.php'),
     [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_acceptance',
-            ],
-        ],
     ]
 );

apps/advanced/tests/codeception/config/backend/config.php

@@ -0,0 +1,2 @@
+<?php
+return [];

apps/advanced/tests/codeception/config/backend/functional.php

@@ -7,12 +7,9 @@ return yii\helpers\ArrayHelper::merge(
     require(ROOT_DIR . '/backend/config/main-local.php'),
     require(ROOT_DIR . '/common/config/main.php'),
     require(ROOT_DIR . '/common/config/main-local.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/functional.php'),
+    require(__DIR__ . '/config.php'),
     [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_functional',
-            ],
-        ],
     ]
 );

apps/advanced/tests/codeception/config/backend/unit.php

@@ -5,12 +5,9 @@ return yii\helpers\ArrayHelper::merge(
     require(ROOT_DIR . '/common/config/main-local.php'),
     require(ROOT_DIR . '/backend/config/main.php'),
     require(ROOT_DIR . '/backend/config/main-local.php'),
-    require(dirname(__DIR__) . '/_config.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/unit.php'),
+    require(__DIR__ . '/config.php'),
     [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_unit',
-            ],
-        ],
     ]
 );

apps/advanced/tests/codeception/config/common/unit.php

@@ -1,15 +1,13 @@
 <?php
-
+/**
+ * Application config for common unit tests
+ */
 return yii\helpers\ArrayHelper::merge(
     require(ROOT_DIR . '/common/config/main.php'),
     require(ROOT_DIR . '/common/config/main-local.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/unit.php'),
     [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_unit',
-            ],
-        ],
         'id' => 'app-common',
         'basePath' => dirname(__DIR__),
     ]

apps/advanced/tests/codeception/config/config.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * application configurations shared by all test types
+ * Application configuration shared by all applications and test types
  */
 return [
     'components' => [

apps/advanced/tests/codeception/config/console/unit.php

@@ -0,0 +1,12 @@
+<?php
+
+return yii\helpers\ArrayHelper::merge(
+    require(ROOT_DIR . '/common/config/main.php'),
+    require(ROOT_DIR . '/common/config/main-local.php'),
+    require(ROOT_DIR . '/console/config/main.php'),
+    require(ROOT_DIR . '/console/config/main-local.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/unit.php'),
+    [
+    ]
+);

apps/advanced/tests/codeception/config/frontend/acceptance.php

@@ -1,16 +1,13 @@
 <?php
 defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(dirname(__DIR__)))));
 return yii\helpers\ArrayHelper::merge(
-    require(ROOT_DIR . '/frontend/config/main.php'),
-    require(ROOT_DIR . '/frontend/config/main-local.php'),
     require(ROOT_DIR . '/common/config/main.php'),
     require(ROOT_DIR . '/common/config/main-local.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(ROOT_DIR . '/frontend/config/main.php'),
+    require(ROOT_DIR . '/frontend/config/main-local.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/acceptance.php'),
+    require(__DIR__ . '/config.php'),
     [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_acceptance',
-            ],
-        ],
     ]
 );

apps/advanced/tests/codeception/config/frontend/config.php

@@ -0,0 +1,2 @@
+<?php
+return [];

apps/advanced/tests/codeception/config/frontend/functional.php

@@ -3,16 +3,13 @@ $_SERVER['SCRIPT_FILENAME'] = FRONTEND_ENTRY_FILE;
 $_SERVER['SCRIPT_NAME'] = FRONTEND_ENTRY_URL;
 
 return yii\helpers\ArrayHelper::merge(
-    require(ROOT_DIR . '/frontend/config/main.php'),
-    require(ROOT_DIR . '/frontend/config/main-local.php'),
     require(ROOT_DIR . '/common/config/main.php'),
     require(ROOT_DIR . '/common/config/main-local.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(ROOT_DIR . '/frontend/config/main.php'),
+    require(ROOT_DIR . '/frontend/config/main-local.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/functional.php'),
+    require(__DIR__ . '/config.php'),
     [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_functional',
-            ],
-        ],
     ]
 );

apps/advanced/tests/codeception/config/frontend/unit.php

@@ -5,12 +5,9 @@ return yii\helpers\ArrayHelper::merge(
     require(ROOT_DIR . '/common/config/main-local.php'),
     require(ROOT_DIR . '/frontend/config/main.php'),
     require(ROOT_DIR . '/frontend/config/main-local.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(dirname(__DIR__) . '/config.php'),
+    require(dirname(__DIR__) . '/unit.php'),
+    require(__DIR__ . '/config.php'),
     [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_unit',
-            ],
-        ],
     ]
 );

apps/advanced/tests/codeception/config/functional.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ * Application configuration shared by all applications functional tests
+ */
+return [
+    'components' => [
+        'db' => [
+            'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_acceptance',
+        ],
+    ],
+];

apps/advanced/tests/codeception/config/unit.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ * Application configuration shared by all applications unit tests
+ */
+return [
+    'components' => [
+        'db' => [
+            'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_unit',
+        ],
+    ],
+];

apps/advanced/tests/codeception/console/_config.php

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

apps/advanced/tests/codeception/console/unit/DbTestCase.php

@@ -7,5 +7,5 @@ namespace console\tests\unit;
  */
 class DbTestCase extends \yii\codeception\DbTestCase
 {
-    public $appConfig = '@console/tests/unit/_config.php';
+    public $appConfig = '@codeception/config/console/config.php';
 }

apps/advanced/tests/codeception/console/unit/TestCase.php

@@ -7,5 +7,5 @@ namespace console\tests\unit;
  */
 class TestCase extends \yii\codeception\TestCase
 {
-    public $appConfig = '@console/tests/unit/_config.php';
+    public $appConfig = '@codeception/config/console/config.php';
 }

apps/advanced/tests/codeception/console/unit/_config.php

@@ -1,16 +0,0 @@
-<?php
-
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../../common/config/main.php'),
-    require(__DIR__ . '/../../../common/config/main-local.php'),
-    require(__DIR__ . '/../../config/main.php'),
-    require(__DIR__ . '/../../config/main-local.php'),
-    require(__DIR__ . '/../_config.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_unit',
-            ],
-        ],
-    ]
-);

apps/advanced/tests/codeception/frontend/_config.php

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

apps/advanced/tests/codeception/frontend/acceptance/_bootstrap.php

@@ -1,3 +1,2 @@
 <?php
-
-new yii\web\Application(require(__DIR__ . '/_config.php'));
+new yii\web\Application(require(dirname(dirname(__DIR__)) . '/config/frontend/acceptance.php'));

apps/advanced/tests/codeception/frontend/functional.suite.yml

@@ -14,4 +14,4 @@ modules:
       - codeception\common\_support\FixtureHelper
     config:
         Yii2:
-            configFile: 'functional/_config.php'
+            configFile: '../config/frontend/functional.php'

apps/advanced/tests/codeception/frontend/functional/_bootstrap.php

@@ -1,3 +1,3 @@
 <?php
 
-new yii\web\Application(require(__DIR__ . '/_config.php'));
+new yii\web\Application(require(dirname(dirname(__DIR__)) . '/config/frontend/functional.php'));

apps/advanced/tests/codeception/frontend/unit/DbTestCase.php

@@ -7,5 +7,5 @@ namespace codeception\frontend\unit;
  */
 class DbTestCase extends \yii\codeception\DbTestCase
 {
-    public $appConfig = '@codeception/frontend/unit/_config.php';
+    public $appConfig = '@codeception/config/frontend/unit.php';
 }

apps/advanced/tests/codeception/frontend/unit/TestCase.php

@@ -7,5 +7,5 @@ namespace codeception\frontend\unit;
  */
 class TestCase extends \yii\codeception\TestCase
 {
-    public $appConfig = '@codeception/frontend/unit/_config.php';
+    public $appConfig = '@codeception/config/frontend/unit.php';
 }

apps/basic/tests/codeception/_config.php

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

apps/basic/tests/codeception/acceptance/ContactCept.php

@@ -21,11 +21,11 @@ $I->see('The verification code is incorrect');
 
 $I->amGoingTo('submit contact form with not correct email');
 $contactPage->submit([
-    'name'			=>	'tester',
-    'email'			=>	'tester.email',
-    'subject'		=>	'test subject',
-    'body'			=>	'test content',
-    'verifyCode'	=>	'testme',
+    'name' => 'tester',
+    'email' => 'tester.email',
+    'subject' => 'test subject',
+    'body' => 'test content',
+    'verifyCode' => 'testme',
 ]);
 $I->expectTo('see that email adress is wrong');
 $I->dontSee('Name cannot be blank', '.help-inline');
@@ -36,11 +36,11 @@ $I->dontSee('The verification code is incorrect', '.help-inline');
 
 $I->amGoingTo('submit contact form with correct data');
 $contactPage->submit([
-    'name'			=>	'tester',
-    'email'			=>	'tester@example.com',
-    'subject'		=>	'test subject',
-    'body'			=>	'test content',
-    'verifyCode'	=>	'testme',
+    'name' => 'tester',
+    'email' => 'tester@example.com',
+    'subject' => 'test subject',
+    'body' => 'test content',
+    'verifyCode' => 'testme',
 ]);
 if (method_exists($I, 'wait')) {
     $I->wait(3); // only for selenium

apps/basic/tests/codeception/acceptance/_bootstrap.php

@@ -1,3 +1,2 @@
 <?php
-
-new yii\web\Application(require(__DIR__ . '/_config.php'));
+new yii\web\Application(require(dirname(__DIR__) . '/config/acceptance.php'));

apps/basic/tests/codeception/bin/_bootstrap.php

@@ -1,7 +1,5 @@
 <?php
-
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-
 defined('YII_ENV') or define('YII_ENV', 'test');
 
 // fcgi doesn't have STDIN and STDOUT defined by default

apps/basic/tests/codeception/bin/yii_acceptance

@@ -8,11 +8,11 @@
  * @license http://www.yiiframework.com/license/
  */
 
-require_once __DIR__ . '/_console_bootstrap.php';
+require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
     require(ROOT_DIR . '/config/console.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(__DIR__ . '/../config/config.php'),
     [
         'components' => [
             'db' => [

apps/basic/tests/codeception/bin/yii_functional

@@ -8,11 +8,11 @@
  * @license http://www.yiiframework.com/license/
  */
 
-require_once __DIR__ . '/_console_bootstrap.php';
+require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
     require(ROOT_DIR . '/config/console.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(__DIR__ . '/../config/config.php'),
     [
         'components' => [
             'db' => [

apps/basic/tests/codeception/bin/yii_unit

@@ -8,11 +8,11 @@
  * @license http://www.yiiframework.com/license/
  */
 
-require_once __DIR__ . '/_console_bootstrap.php';
+require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
     require(ROOT_DIR . '/config/console.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(__DIR__ . '/../config/config.php'),
     [
         'components' => [
             'db' => [

apps/basic/tests/codeception/config/acceptance.php

@@ -1,8 +1,10 @@
 <?php
-
+/**
+ * Application configuration for acceptance tests
+ */
 return yii\helpers\ArrayHelper::merge(
     require(__DIR__ . '/../../../config/web.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(__DIR__ . '/config.php'),
     [
         'components' => [
             'db' => [

apps/basic/tests/codeception/config/config.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * application configurations shared by all test types
+ * Application configuration shared by all test types
  */
 return [
     'components' => [

apps/basic/tests/codeception/config/functional.php

@@ -2,9 +2,12 @@
 $_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
 $_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
 
+/**
+ * Application configuration for functional tests
+ */
 return yii\helpers\ArrayHelper::merge(
     require(__DIR__ . '/../../../config/web.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(__DIR__ . '/config.php'),
     [
         'components' => [
             'db' => [

apps/basic/tests/codeception/config/unit.php

@@ -1,8 +1,10 @@
 <?php
-
+/**
+ * Application configuration for unit tests
+ */
 return yii\helpers\ArrayHelper::merge(
     require(__DIR__ . '/../../../config/web.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(__DIR__ . '/config.php'),
     [
         'components' => [
             'db' => [

apps/basic/tests/codeception/functional.suite.yml

@@ -13,4 +13,4 @@ modules:
       - Yii2
     config:
         Yii2:
-            configFile: 'codeception/functional/_config.php'
+            configFile: 'codeception/config/functional.php'

apps/basic/tests/codeception/functional/_bootstrap.php

@@ -1,3 +1,2 @@
 <?php
-
-new yii\web\Application(require(__DIR__ . '/_config.php'));
+new yii\web\Application(require(dirname(__DIR__) . '/config/functional.php'));

apps/basic/web/index-test.php

@@ -11,6 +11,6 @@ defined('YII_ENV') or define('YII_ENV', 'test');
 require(__DIR__ . '/../vendor/autoload.php');
 require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
 
-$config = require(__DIR__ . '/../tests/codeception/acceptance/_config.php');
+$config = require(__DIR__ . '/../tests/codeception/config/acceptance.php');
 
 (new yii\web\Application($config))->run();

extensions/codeception/TestCase.php

@@ -31,7 +31,7 @@ class TestCase extends Test
      * The application configuration array may contain an optional `class` element which specifies the class
      * name of the application instance to be created. By default, a [[\yii\web\Application]] instance will be created.
      */
-    public $appConfig = '@codeception/unit/_config.php';
+    public $appConfig = '@codeception/config/unit.php';
 
 
     /**