MAGETWO-33455: Cover Config-based Integration Creation with Test

- fixed a  bug related to setup module

Author: arkadiych

dev/tests/unit/testsuite/Magento/Setup/Model/AdminAccountTest.php

@@ -90,8 +90,8 @@ public function testSaveUserExistsAdminRoleExists()
                 $existingUserData,
             ],
             [
-                'SELECT * FROM authorization_role WHERE user_id = :user_id',
-                ['user_id' => 1],
+                'SELECT * FROM authorization_role WHERE user_id = :user_id AND user_type = :user_type',
+                ['user_id' => 1, 'user_type' => 2],
                 null,
                 $existingAdminRoleData,
             ],
@@ -137,8 +137,8 @@ public function testSaveUserExistsNewAdminRole()
                 $existingUserData,
             ],
             [
-                'SELECT * FROM authorization_role WHERE user_id = :user_id',
-                ['user_id' => 1],
+                'SELECT * FROM authorization_role WHERE user_id = :user_id AND user_type = :user_type',
+                ['user_id' => 1, 'user_type' => 2],
                 null,
                 [],
             ],
@@ -193,8 +193,8 @@ public function testSaveNewUserAdminRoleExists()
                 [],
             ],
             [
-                'SELECT * FROM authorization_role WHERE user_id = :user_id',
-                ['user_id' => 1],
+                'SELECT * FROM authorization_role WHERE user_id = :user_id AND user_type = :user_type',
+                ['user_id' => 1, 'user_type' => 2],
                 null,
                 $existingAdminRoleData,
             ],
@@ -233,8 +233,8 @@ public function testSaveNewUserNewAdminRole()
                 [],
             ],
             [
-                'SELECT * FROM authorization_role WHERE user_id = :user_id',
-                ['user_id' => 1],
+                'SELECT * FROM authorization_role WHERE user_id = :user_id AND user_type = :user_type',
+                ['user_id' => 1, 'user_type' => 2],
                 null,
                 [],
             ],

setup/src/Magento/Setup/Model/AdminAccount.php

@@ -169,8 +169,8 @@ private function saveAdminUserRole($adminId)
     {
         $result = $this->setup->getConnection()->fetchRow(
             'SELECT * FROM ' . $this->setup->getTable('authorization_role') . ' ' .
-            'WHERE user_id = :user_id',
-            ['user_id' => $adminId]
+            'WHERE user_id = :user_id AND user_type = :user_type',
+            ['user_id' => $adminId, 'user_type' => UserContextInterface::USER_TYPE_ADMIN]
         );
         if (empty($result)) {
             // No user role exists for this user id, create it