From 7a467ed501812dd6a07d6af3b8279809dd94d8d6 Mon Sep 17 00:00:00 2001
From: Mark <mark.github@yandex.ru>
Date: Mon, 9 Jun 2014 16:10:16 +0400
Subject: [PATCH] basic application template tests adjusted

---
 tests/unit/models/ContactFormTest.php |  4 ++-
 tests/unit/models/LoginFormTest.php   | 36 +++++++++++----------------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/tests/unit/models/ContactFormTest.php b/tests/unit/models/ContactFormTest.php
index d8a55ee..fe214fa 100644
--- a/tests/unit/models/ContactFormTest.php
+++ b/tests/unit/models/ContactFormTest.php
@@ -4,10 +4,11 @@ namespace tests\unit\models;
 
 use Yii;
 use yii\codeception\TestCase;
+use Codeception\Specify;
 
 class ContactFormTest extends TestCase
 {
-    use \Codeception\Specify;
+    use Specify;
 
     protected function setUp()
     {
@@ -55,4 +56,5 @@ class ContactFormTest extends TestCase
     {
         return Yii::getAlias(Yii::$app->mail->fileTransportPath) . '/testing_message.eml';
     }
+
 }
diff --git a/tests/unit/models/LoginFormTest.php b/tests/unit/models/LoginFormTest.php
index c2c28cc..f2c60f5 100644
--- a/tests/unit/models/LoginFormTest.php
+++ b/tests/unit/models/LoginFormTest.php
@@ -4,11 +4,12 @@ namespace tests\unit\models;
 
 use Yii;
 use yii\codeception\TestCase;
-use app\models\User;
+use app\models\LoginForm;
+use Codeception\Specify;
 
 class LoginFormTest extends TestCase
 {
-    use \Codeception\Specify;
+    use Specify;
 
     protected function tearDown()
     {
@@ -18,10 +19,10 @@ class LoginFormTest extends TestCase
 
     public function testLoginNoUser()
     {
-        $model = $this->mockUser(null);
-
-        $model->username = 'some_username';
-        $model->password = 'some_password';
+        $model = new LoginForm([
+            'username' => 'not_existing_username',
+            'password' => 'not_existing_password',
+        ]);
 
         $this->specify('user should not be able to login, when there is no identity', function () use ($model) {
             expect('model should not login user', $model->login())->false();
@@ -31,10 +32,10 @@ class LoginFormTest extends TestCase
 
     public function testLoginWrongPassword()
     {
-        $model = $this->mockUser(new User);
-
-        $model->username = 'demo';
-        $model->password = 'wrong-password';
+        $model = new LoginForm([
+            'username' => 'demo',
+            'password' => 'wrong_password',
+        ]);
 
         $this->specify('user should not be able to login with wrong password', function () use ($model) {
             expect('model should not login user', $model->login())->false();
@@ -45,10 +46,10 @@ class LoginFormTest extends TestCase
 
     public function testLoginCorrect()
     {
-        $model = $this->mockUser(new User(['password' => 'demo']));
-
-        $model->username = 'demo';
-        $model->password = 'demo';
+        $model = new LoginForm([
+            'username' => 'demo',
+            'password' => 'demo',
+        ]);
 
         $this->specify('user should be able to login with correct credentials', function () use ($model) {
             expect('model should login user', $model->login())->true();
@@ -57,11 +58,4 @@ class LoginFormTest extends TestCase
         });
     }
 
-    private function mockUser($user)
-    {
-        $loginForm = $this->getMock('app\models\LoginForm', ['getUser']);
-        $loginForm->expects($this->any())->method('getUser')->will($this->returnValue($user));
-
-        return $loginForm;
-    }
 }