fixture structure refactored

yarcode · Jul 8, 2017 · 162f139 · 162f139
1 parent 8db9a92
commit 162f139
Showing 11 changed files with 52 additions and 60 deletions.
diff --git a/backend/fixtures/UserProfile.php b/backend/fixtures/UserProfile.php
diff --git a/backend/tests/functional/LoginCest.php b/backend/tests/functional/LoginCest.php
@@ -3,8 +3,8 @@
 namespace backend\tests\functional;
 
 use backend\tests\FunctionalTester;
-use backend\fixtures\UserAccount as UserAccountFixture;
-use backend\fixtures\UserProfile as UserProfileFixture;
+use common\fixtures\UserAccountFixture;
+use common\fixtures\UserProfileFixture;
 
 /**
  * Class LoginCest
@@ -14,22 +14,26 @@ class LoginCest
     function _before(FunctionalTester $I)
     {
         $I->haveFixtures([
-
             'userAccount' => [
-                'class' => UserAccountFixture::className(),
+                'class' => UserAccountFixture::class,
                 'dataFile' => codecept_data_dir() . 'user_account.php'
             ],
-
             'userProfile' => [
-                'class' => UserProfileFixture::className(),
+                'class' => UserProfileFixture::class,
                 'dataFile' => codecept_data_dir() . 'user_profile.php'
-            ]
-
+            ],
         ]);
 
         $I->amOnRoute('site/login');
     }
 
+    public function checkEmpty(FunctionalTester $I)
+    {
+        $I->submitForm('#login-form', $this->formParams('', ''));
+        $I->seeValidationError('Account Name cannot be blank.');
+        $I->seeValidationError('Password cannot be blank.');
+    }
+
     protected function formParams($login, $password)
     {
         return [
@@ -38,13 +42,6 @@ protected function formParams($login, $password)
         ];
     }
 
-    public function checkEmpty(FunctionalTester $I)
-    {
-        $I->submitForm('#login-form', $this->formParams('', ''));
-        $I->seeValidationError('Account Name cannot be blank.');
-        $I->seeValidationError('Password cannot be blank.');
-    }
-
     public function checkWrongPassword(FunctionalTester $I)
     {
         $I->submitForm('#login-form', $this->formParams('admin', 'wrong'));

diff --git a/backend/tests/unit/models/LoginFormTest.php b/backend/tests/unit/models/LoginFormTest.php
@@ -2,9 +2,9 @@
 
 namespace backend\tests\unit\models;
 
-use Yii;
 use backend\models\LoginForm;
-use backend\fixtures\UserAccount as UserAccountFixture;
+use common\fixtures\UserAccountFixture;
+use Yii;
 
 /**
  * Login form test
@@ -21,7 +21,7 @@ public function _before()
     {
         $this->tester->haveFixtures([
             'userAccount' => [
-                'class' => UserAccountFixture::className(),
+                'class' => UserAccountFixture::class,
                 'dataFile' => codecept_data_dir() . 'login_data.php'
             ]
         ]);

diff --git a/backend/fixtures/UserAccount.php → common/fixtures/UserAccountFixture.php b/backend/fixtures/UserAccount.php → common/fixtures/UserAccountFixture.php
@@ -1,9 +1,9 @@
 <?php
-namespace backend\fixtures;
+namespace common\fixtures;
 
 use yii\test\ActiveFixture;
 
-class UserAccount extends ActiveFixture
+class UserAccountFixture extends ActiveFixture
 {
     public $modelClass = 'common\models\UserAccount';
 }
diff --git a/common/fixtures/UserProfileFixture.php b/common/fixtures/UserProfileFixture.php
@@ -0,0 +1,13 @@
+<?php
+namespace common\fixtures;
+
+use yii\test\ActiveFixture;
+
+class UserProfileFixture extends ActiveFixture
+{
+    public $modelClass = 'common\models\UserProfile';
+
+    public $depends = [
+        UserAccountFixture::class,
+    ];
+}
diff --git a/frontend/fixtures/UserAccount.php b/frontend/fixtures/UserAccount.php
diff --git a/frontend/tests/_data/login_data.php b/frontend/tests/_data/login_data.php
@@ -19,7 +19,7 @@
         'password_reset_token' => 'RkD_Jw0_8HEedzLk7MM-ZKEFfYR7VbMr_1392559490',
         'created_at' => '2016-11-18 20:49:13',
         'updated_at' => '2016-11-18 20:49:13',
-        'email' => 'sfriesen@jenkins.info',
+        'email' => 'sfriesen-inactive@jenkins.info',
         'status' => 0 // 0 - inactive
     ],
 ];
diff --git a/frontend/tests/functional/LoginCest.php b/frontend/tests/functional/LoginCest.php
@@ -2,23 +2,30 @@
 
 namespace frontend\tests\functional;
 
+use common\fixtures\UserAccountFixture;
 use frontend\tests\FunctionalTester;
-use frontend\fixtures\UserAccount as UserAccountFixture;
 
 class LoginCest
 {
     function _before(FunctionalTester $I)
     {
         $I->haveFixtures([
             'userAccount' => [
-                'class' => UserAccountFixture::className(),
+                'class' => UserAccountFixture::class,
                 'dataFile' => codecept_data_dir() . 'user_account.php'
             ]
         ]);
 
         $I->amOnRoute('site/login');
     }
 
+    public function checkEmpty(FunctionalTester $I)
+    {
+        $I->submitForm('#login-form', $this->formParams('', ''));
+        $I->seeValidationError('Account Name cannot be blank.');
+        $I->seeValidationError('Password cannot be blank.');
+    }
+
     protected function formParams($login, $password)
     {
         return [
@@ -27,19 +34,12 @@ protected function formParams($login, $password)
         ];
     }
 
-    public function checkEmpty(FunctionalTester $I)
-    {
-        $I->submitForm('#login-form', $this->formParams('', ''));
-        $I->seeValidationError('Account Name cannot be blank.');
-        $I->seeValidationError('Password cannot be blank.');
-    }
-
     public function checkWrongPassword(FunctionalTester $I)
     {
         $I->submitForm('#login-form', $this->formParams('admin', 'wrong'));
         $I->seeValidationError('Incorrect username or password.');
     }
-    
+
     public function checkValidLogin(FunctionalTester $I)
     {
         $I->submitForm('#login-form', $this->formParams('okirlin', 'password_0'));

diff --git a/frontend/tests/unit/models/LoginFormTest.php b/frontend/tests/unit/models/LoginFormTest.php
@@ -2,9 +2,9 @@
 
 namespace frontend\tests\unit\models;
 
-use Yii;
+use common\fixtures\UserAccountFixture;
 use frontend\models\LoginForm;
-use frontend\fixtures\UserAccount as UserAccountFixture;
+use Yii;
 
 /**
  * Login form test
@@ -21,7 +21,7 @@ public function _before()
     {
         $this->tester->haveFixtures([
             'userAccount' => [
-                'class' => UserAccountFixture::className(),
+                'class' => UserAccountFixture::class,
                 'dataFile' => codecept_data_dir() . 'login_data.php'
             ]
         ]);

diff --git a/frontend/tests/unit/models/PasswordResetRequestFormTest.php b/frontend/tests/unit/models/PasswordResetRequestFormTest.php
@@ -2,10 +2,10 @@
 
 namespace frontend\tests\unit\models;
 
-use Yii;
-use frontend\models\PasswordResetRequestForm;
-use frontend\fixtures\UserAccount as UserAccountFixture;
+use common\fixtures\UserAccountFixture;
 use common\models\UserAccount;
+use frontend\models\PasswordResetRequestForm;
+use Yii;
 
 class PasswordResetRequestFormTest extends \Codeception\Test\Unit
 {
@@ -19,7 +19,7 @@ public function _before()
     {
         $this->tester->haveFixtures([
             'userAccount' => [
-                'class' => UserAccountFixture::className(),
+                'class' => UserAccountFixture::class,
                 'dataFile' => codecept_data_dir() . 'user_account.php'
             ]
         ]);

diff --git a/frontend/tests/unit/models/ResetPasswordFormTest.php b/frontend/tests/unit/models/ResetPasswordFormTest.php
@@ -2,7 +2,7 @@
 
 namespace frontend\tests\unit\models;
 
-use frontend\fixtures\UserAccount as UserAccountFixture;
+use common\fixtures\UserAccountFixture;
 use frontend\models\ResetPasswordForm;
 
 class ResetPasswordFormTest extends \Codeception\Test\Unit
@@ -17,19 +17,19 @@ public function _before()
     {
         $this->tester->haveFixtures([
             'userAccount' => [
-                'class' => UserAccountFixture::className(),
+                'class' => UserAccountFixture::class,
                 'dataFile' => codecept_data_dir() . 'user_account.php'
             ]
         ]);
     }
 
     public function testResetWrongToken()
     {
-        $this->tester->expectException('yii\base\InvalidParamException', function() {
+        $this->tester->expectException('yii\base\InvalidParamException', function () {
             new ResetPasswordForm('');
         });
 
-        $this->tester->expectException('yii\base\InvalidParamException', function() {
+        $this->tester->expectException('yii\base\InvalidParamException', function () {
             new ResetPasswordForm('notexistingtoken_1391882543');
         });
     }