Восстановлен запуск тестов

Загрузчик конфигов выделен в отдельный класс
authserverHost выделена в params
Исправлены некоторые common.unit тесты, т.к. наследовались не от того базового класса
This commit is contained in:
ErickSkrauch
2016-09-19 01:01:19 +03:00
parent 54485b2271
commit df6d319187
35 changed files with 147 additions and 190 deletions

View File

@@ -10,6 +10,6 @@ return [
],
],
'params' => [
'authserverDomain' => 'http://authserver.ely.by',
'authserverHost' => 'authserver.ely.by',
],
];

View File

@@ -2,16 +2,9 @@
$_SERVER['SCRIPT_FILENAME'] = API_ENTRY_FILE;
$_SERVER['SCRIPT_NAME'] = API_ENTRY_URL;
/**
* Application configuration for api functional tests
*/
return yii\helpers\ArrayHelper::merge(
require(YII_APP_BASE_PATH . '/common/config/main.php'),
require(YII_APP_BASE_PATH . '/common/config/main-local.php'), require(YII_APP_BASE_PATH . '/api/config/main.php'),
require(YII_APP_BASE_PATH . '/api/config/main-local.php'),
require(dirname(__DIR__) . '/config.php'),
require(dirname(__DIR__) . '/functional.php'),
require(__DIR__ . '/config.php'),
[
]
\common\config\ConfigLoader::load('api'),
require __DIR__ . '/../config.php',
require __DIR__ . '/../functional.php',
require __DIR__ . '/config.php'
);

View File

@@ -1,15 +1,7 @@
<?php
/**
* Application configuration for api unit tests
*/
return yii\helpers\ArrayHelper::merge(
require(YII_APP_BASE_PATH . '/common/config/main.php'),
require(YII_APP_BASE_PATH . '/common/config/main-local.php'), require(YII_APP_BASE_PATH . '/api/config/main.php'),
require(YII_APP_BASE_PATH . '/api/config/main-local.php'),
require(dirname(__DIR__) . '/config.php'),
require(dirname(__DIR__) . '/unit.php'),
require(__DIR__ . '/config.php'),
[
]
\common\config\ConfigLoader::load('api'),
require __DIR__ . '/../config.php',
require __DIR__ . '/../unit.php',
require __DIR__ . '/config.php'
);

View File

@@ -1,12 +1,8 @@
<?php
/**
* Application config for common unit tests
*/
return yii\helpers\ArrayHelper::merge(
require(YII_APP_BASE_PATH . '/common/config/main.php'),
require(YII_APP_BASE_PATH . '/common/config/main-local.php'),
require(dirname(__DIR__) . '/config.php'),
require(dirname(__DIR__) . '/unit.php'),
\common\config\ConfigLoader::load('common'),
require __DIR__ . '/../config.php',
require __DIR__ . '/../unit.php',
[
'id' => 'app-common',
'basePath' => dirname(__DIR__),

View File

@@ -3,7 +3,7 @@ return [
'language' => 'en-US',
'controllerMap' => [
'fixture' => [
'class' => 'yii\faker\FixtureController',
'class' => yii\faker\FixtureController::class,
'fixtureDataPath' => '@tests/codeception/common/fixtures/data',
'templatePath' => '@tests/codeception/common/templates/fixtures',
'namespace' => 'tests\codeception\common\fixtures',

View File

@@ -1,14 +1,6 @@
<?php
/**
* Application configuration for console unit tests
*/
return yii\helpers\ArrayHelper::merge(
require(YII_APP_BASE_PATH . '/common/config/main.php'),
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.php'),
require(dirname(__DIR__) . '/unit.php'),
[
]
\common\config\ConfigLoader::load('console'),
require __DIR__ . '/../config.php',
require __DIR__ . '/../unit.php'
);

View File

@@ -1,18 +1,12 @@
<?php
/**
* Application configuration shared by all applications functional tests
*/
return [
'components' => [
'request' => [
// it's not recommended to run functional tests with CSRF validation enabled
// TODO: у нас вроде и без того нет проверки csrf
'enableCsrfValidation' => false,
'enableCookieValidation' => false,
// but if you absolutely need it set cookie domain to localhost
/*
'csrfCookie' => [
'domain' => 'localhost',
],
*/
],
],
];
];

View File

@@ -1,7 +1,4 @@
<?php
/**
* Application configuration shared by all applications unit tests
*/
return [
];
];