From adf5283375b596d5497cff2da7d631a4d0e7c35b Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Fri, 26 Oct 2018 13:23:03 +0300
Subject: [PATCH] user and test fixes

---
 application/Espo/Entities/User.php        | 2 +-
 tests/integration/Core/Tester.php         | 2 +-
 tests/integration/Espo/User/AclTest.php   | 4 ++--
 tests/integration/testData/InitData.php   | 1 +
 tests/integration/testData/User/Login.php | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/application/Espo/Entities/User.php b/application/Espo/Entities/User.php
index 007b7f3a53..ac4ebda3b0 100644
--- a/application/Espo/Entities/User.php
+++ b/application/Espo/Entities/User.php
@@ -53,7 +53,7 @@ class User extends \Espo\Core\Entities\Person
 
     public function isRegular()
     {
-        return $this->get('type') === 'regular';
+        return $this->get('type') === 'regular' || ($this->has('type') && !$this->get('type'));
     }
 
     public function isApi()
diff --git a/tests/integration/Core/Tester.php b/tests/integration/Core/Tester.php
index 041e8068c5..29211636c9 100644
--- a/tests/integration/Core/Tester.php
+++ b/tests/integration/Core/Tester.php
@@ -296,7 +296,7 @@ class Tester
         $userData['password'] = $passwordHash->hash($userData['password']);
 
         if ($isPortal) {
-            $userData['isPortalUser'] = true;
+            $userData['type'] = 'portal';
         }
 
         $user = $entityManager->getEntity('User');
diff --git a/tests/integration/Espo/User/AclTest.php b/tests/integration/Espo/User/AclTest.php
index 6e16ccd5e7..c8dd48d850 100644
--- a/tests/integration/Espo/User/AclTest.php
+++ b/tests/integration/Espo/User/AclTest.php
@@ -197,14 +197,14 @@ class AclTest extends \tests\integration\Core\BaseTestCase
         ];
         $data = [
             'id' => $user1->id,
-            'isAdmin' => 1,
+            'type' => 'admin',
             'teamsIds' => ['id']
         ];
         $request = $this->createRequest('PATCH', $params, ['CONTENT_TYPE' => 'application/json']);
         $result = $controllerManager->process('User', 'update', $params, json_encode($data), $request);
         $resultData = json_decode($result);
 
-        $this->assertTrue(!property_exists($resultData, 'isAdmin') || !$resultData->isAdmin);
+        $this->assertTrue(!property_exists($resultData, 'type') || $resultData->type !== 'admin');
         $this->assertTrue(
             !property_exists($resultData, 'teamsIds') || !is_array($resultData->teamsIds) || !in_array('id', $$resultData->teamsIds)
         );
diff --git a/tests/integration/testData/InitData.php b/tests/integration/testData/InitData.php
index 0442fb22e5..2cac8f1168 100644
--- a/tests/integration/testData/InitData.php
+++ b/tests/integration/testData/InitData.php
@@ -33,6 +33,7 @@ return array(
             array(
                 'id' => '1',
                 'isAdmin' => true,
+                'type' => 'admin',
                 'userName' => 'admin',
                 'password' => '1',
                 'salutationName' => '',
diff --git a/tests/integration/testData/User/Login.php b/tests/integration/testData/User/Login.php
index 5b08ea46ee..1a351e422b 100644
--- a/tests/integration/testData/User/Login.php
+++ b/tests/integration/testData/User/Login.php
@@ -33,6 +33,7 @@ return array(
             array(
                 'id' => '1',
                 'isAdmin' => true,
+                'type' => 'admin',
                 'userName' => 'admin',
                 'password' => '1',
                 'salutationName' => '',