Upgrade Codeception до 2.2 (падает тест в AccountIdentity при массовом прогоне, т.к. изменился домен, походу)

This commit is contained in:
ErickSkrauch 2016-09-19 02:13:17 +03:00
parent 01b68afc19
commit 264cb25ddc
6 changed files with 11 additions and 14 deletions

View File

@ -33,10 +33,11 @@
"yiisoft/yii2-gii": "*", "yiisoft/yii2-gii": "*",
"yiisoft/yii2-faker": "*", "yiisoft/yii2-faker": "*",
"flow/jsonpath": "^0.3.1", "flow/jsonpath": "^0.3.1",
"codeception/codeception": "~2.1.10", "codeception/codeception": "~2.2.4",
"codeception/specify": "*", "codeception/specify": "*",
"codeception/verify": "*", "codeception/verify": "*",
"phploc/phploc": "^3.0.1" "phploc/phploc": "^3.0.1",
"predis/predis": "^1.0"
}, },
"config": { "config": {
"process-timeout": 1800 "process-timeout": 1800

View File

@ -3,8 +3,7 @@ use Codeception\Configuration;
use Codeception\Specify\Config; use Codeception\Specify\Config;
defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV_TEST') or define('YII_ENV_TEST', true); defined('YII_ENV') or define('YII_ENV', 'test');
defined('YII_ENV') or define('YII_ENV', 'dev');
defined('API_ENTRY_URL') or define('API_ENTRY_URL', parse_url(Configuration::config()['config']['test_entry_url'], PHP_URL_PATH)); defined('API_ENTRY_URL') or define('API_ENTRY_URL', parse_url(Configuration::config()['config']['test_entry_url'], PHP_URL_PATH));
defined('API_ENTRY_FILE') or define('API_ENTRY_FILE', __DIR__ . '/../../../api/web/index.php'); defined('API_ENTRY_FILE') or define('API_ENTRY_FILE', __DIR__ . '/../../../api/web/index.php');

View File

@ -1,7 +1,6 @@
<?php <?php
defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV_TEST') or define('YII_ENV_TEST', true); defined('YII_ENV') or define('YII_ENV', 'test');
defined('YII_ENV') or define('YII_ENV', 'dev');
require_once __DIR__ . '/../../../vendor/autoload.php'; require_once __DIR__ . '/../../../vendor/autoload.php';
require_once __DIR__ . '/../../../vendor/yiisoft/yii2/Yii.php'; require_once __DIR__ . '/../../../vendor/yiisoft/yii2/Yii.php';

View File

@ -1,7 +1,6 @@
<?php <?php
defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV_TEST') or define('YII_ENV_TEST', true); defined('YII_ENV') or define('YII_ENV', 'test');
defined('YII_ENV') or define('YII_ENV', 'dev');
require_once __DIR__ . '/../../../vendor/autoload.php'; require_once __DIR__ . '/../../../vendor/autoload.php';
require_once __DIR__ . '/../../../vendor/yiisoft/yii2/Yii.php'; require_once __DIR__ . '/../../../vendor/yiisoft/yii2/Yii.php';

View File

@ -2,7 +2,7 @@
namespace tests\codeception\common\_support; namespace tests\codeception\common\_support;
use Codeception\Module; use Codeception\Module;
use Codeception\TestCase; use Codeception\TestInterface;
use tests\codeception\common\fixtures\AccountFixture; use tests\codeception\common\fixtures\AccountFixture;
use tests\codeception\common\fixtures\AccountSessionFixture; use tests\codeception\common\fixtures\AccountSessionFixture;
use tests\codeception\common\fixtures\EmailActivationFixture; use tests\codeception\common\fixtures\EmailActivationFixture;
@ -32,17 +32,17 @@ class FixtureHelper extends Module {
getFixture as protected; getFixture as protected;
} }
public function _before(TestCase $test) { public function _before(TestInterface $test) {
$this->loadFixtures(); $this->loadFixtures();
} }
public function _after(TestCase $test) { public function _after(TestInterface $test) {
$this->unloadFixtures(); $this->unloadFixtures();
} }
public function globalFixtures() { public function globalFixtures() {
return [ return [
InitDbFixture::className(), InitDbFixture::class,
]; ];
} }

View File

@ -1,7 +1,6 @@
<?php <?php
defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV_TEST') or define('YII_ENV_TEST', true); defined('YII_ENV') or define('YII_ENV', 'test');
defined('YII_ENV') or define('YII_ENV', 'dev');
require_once __DIR__ . '/../../../vendor/autoload.php'; require_once __DIR__ . '/../../../vendor/autoload.php';
require_once __DIR__ . '/../../../vendor/yiisoft/yii2/Yii.php'; require_once __DIR__ . '/../../../vendor/yiisoft/yii2/Yii.php';