From 520b491d1b1862c221b86458182c6e5f6c799acb Mon Sep 17 00:00:00 2001 From: Mark Date: Fri, 13 Dec 2013 19:37:08 +0400 Subject: [PATCH] modified tests according yii2-codeception extension --- apps/basic/tests/_helpers/TestCase.php | 56 ------------------------ apps/basic/tests/_pages/AboutPage.php | 2 +- apps/basic/tests/_pages/BasePage.php | 45 ------------------- apps/basic/tests/_pages/ContactPage.php | 2 +- apps/basic/tests/_pages/LoginPage.php | 2 +- apps/basic/tests/unit/models/ContactFormTest.php | 2 +- apps/basic/tests/unit/models/LoginFormTest.php | 2 +- apps/basic/tests/unit/models/UserTest.php | 2 +- 8 files changed, 6 insertions(+), 107 deletions(-) delete mode 100644 apps/basic/tests/_helpers/TestCase.php delete mode 100644 apps/basic/tests/_pages/BasePage.php diff --git a/apps/basic/tests/_helpers/TestCase.php b/apps/basic/tests/_helpers/TestCase.php deleted file mode 100644 index e92aa51..0000000 --- a/apps/basic/tests/_helpers/TestCase.php +++ /dev/null @@ -1,56 +0,0 @@ -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/apps/basic/tests/_pages/AboutPage.php b/apps/basic/tests/_pages/AboutPage.php index ead55e2..6568507 100644 --- a/apps/basic/tests/_pages/AboutPage.php +++ b/apps/basic/tests/_pages/AboutPage.php @@ -2,7 +2,7 @@ namespace tests\_pages; -class AboutPage extends BasePage +class AboutPage extends \yii\codeception\BasePage { public static $URL = '?r=site/about'; diff --git a/apps/basic/tests/_pages/BasePage.php b/apps/basic/tests/_pages/BasePage.php deleted file mode 100644 index 65c8ee6..0000000 --- a/apps/basic/tests/_pages/BasePage.php +++ /dev/null @@ -1,45 +0,0 @@ -guy = $I; - } - - /** - * @return $this - */ - public static function of($I) - { - return new static($I); - } - -} diff --git a/apps/basic/tests/_pages/ContactPage.php b/apps/basic/tests/_pages/ContactPage.php index b5694c2..48d18df 100644 --- a/apps/basic/tests/_pages/ContactPage.php +++ b/apps/basic/tests/_pages/ContactPage.php @@ -2,7 +2,7 @@ namespace tests\_pages; -class ContactPage extends BasePage +class ContactPage extends \yii\codeception\BasePage { public static $URL = '?r=site/contact'; diff --git a/apps/basic/tests/_pages/LoginPage.php b/apps/basic/tests/_pages/LoginPage.php index 87d5e99..6dad5ed 100644 --- a/apps/basic/tests/_pages/LoginPage.php +++ b/apps/basic/tests/_pages/LoginPage.php @@ -2,7 +2,7 @@ namespace tests\_pages; -class LoginPage extends BasePage +class LoginPage extends \yii\codeception\BasePage { public static $URL = '?r=site/login'; diff --git a/apps/basic/tests/unit/models/ContactFormTest.php b/apps/basic/tests/unit/models/ContactFormTest.php index 66377c7..819cda2 100644 --- a/apps/basic/tests/unit/models/ContactFormTest.php +++ b/apps/basic/tests/unit/models/ContactFormTest.php @@ -2,7 +2,7 @@ namespace tests\unit\models; -class ContactFormTest extends \tests\_helpers\TestCase +class ContactFormTest extends \yii\codeception\TestCase { } diff --git a/apps/basic/tests/unit/models/LoginFormTest.php b/apps/basic/tests/unit/models/LoginFormTest.php index 1f06fa5..9fd09b3 100644 --- a/apps/basic/tests/unit/models/LoginFormTest.php +++ b/apps/basic/tests/unit/models/LoginFormTest.php @@ -2,7 +2,7 @@ namespace tests\unit\models; -class LoginFormTest extends \tests\_helpers\TestCase +class LoginFormTest extends \yii\codeception\TestCase { } \ No newline at end of file diff --git a/apps/basic/tests/unit/models/UserTest.php b/apps/basic/tests/unit/models/UserTest.php index e01ce3d..58110d0 100644 --- a/apps/basic/tests/unit/models/UserTest.php +++ b/apps/basic/tests/unit/models/UserTest.php @@ -4,7 +4,7 @@ namespace tests\unit\models; #use yii\test\DbTestTrait; -class UserTest extends \tests\_helpers\TestCase +class UserTest extends \yii\codeception\TestCase { use DbTestTrait;