diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php index b3d9bbc..e2dcb10 100644 --- a/tests/_bootstrap.php +++ b/tests/_bootstrap.php @@ -1 +1,3 @@ mockApplication(); + } + + protected function tearDown() + { + $this->destroyApplication(); + parent::tearDown(); + } + + protected function mockApplication() + { + $baseConfig = require(__DIR__.'/../unit/_bootstrap.php'); + $config = \yii\helpers\ArrayHelper::merge($baseConfig,$this->config); + new $this->appClass($config); + } + + protected function destroyApplication() + { + \Yii::$app = null; + } + + /** + * Use this method when you need to dump variables with var_dump function. + * This is caused by the buffering output of the codeception. + * @param mixed $var + */ + protected static function varDump($var) + { + ob_start(); + var_dump($var); + \Codeception\Util\Debug::debug(ob_get_clean()); + } + +} diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php index 14d14fd..b677bc1 100644 --- a/tests/unit/_bootstrap.php +++ b/tests/unit/_bootstrap.php @@ -2,9 +2,7 @@ $config = require(__DIR__.'/../yii_bootstrap.php'); -$config = yii\helpers\ArrayHelper::merge( +return yii\helpers\ArrayHelper::merge( $config, require(__DIR__ . '/../../config/codeception/unit.php') ); - -$application = new yii\web\Application($config); diff --git a/tests/unit/models/ContactFormTest.php b/tests/unit/models/ContactFormTest.php index 689f124..66377c7 100644 --- a/tests/unit/models/ContactFormTest.php +++ b/tests/unit/models/ContactFormTest.php @@ -2,15 +2,7 @@ namespace tests\unit\models; -class ContactFormTest extends \PHPUnit_Framework_TestCase +class ContactFormTest extends \tests\_helpers\TestCase { - protected function setUp() - { - } - - protected function tearDown() - { - } - } diff --git a/tests/unit/models/LoginFormTest.php b/tests/unit/models/LoginFormTest.php index 98d5351..1f06fa5 100644 --- a/tests/unit/models/LoginFormTest.php +++ b/tests/unit/models/LoginFormTest.php @@ -2,15 +2,7 @@ namespace tests\unit\models; -class LoginFormTest extends \PHPUnit_Framework_TestCase +class LoginFormTest extends \tests\_helpers\TestCase { - protected function setUp() - { - } - - protected function tearDown() - { - } - } \ No newline at end of file diff --git a/tests/unit/models/UserTest.php b/tests/unit/models/UserTest.php index f73e8a3..e01ce3d 100644 --- a/tests/unit/models/UserTest.php +++ b/tests/unit/models/UserTest.php @@ -4,7 +4,7 @@ namespace tests\unit\models; #use yii\test\DbTestTrait; -class UserTest extends \PHPUnit_Framework_TestCase +class UserTest extends \tests\_helpers\TestCase { use DbTestTrait; @@ -12,16 +12,14 @@ class UserTest extends \PHPUnit_Framework_TestCase protected function setUp() { /* + * * you can load fixtures in this way * + parent::setUp(); $this->loadFixtures([ 'tbl_user', ]); */ } - protected function tearDown() - { - } - }