Merge branch 'pu/pm/testsUnrollCreatedAccounts' into '2022.11'

tests(TB accounts) added unittest plugin to unroll accounts -> emailUsers See merge request tine20/tine20!3697
tine20 · Apr 12, 2023 · 1d822a0 · 1d822a0
2 parents 1dc3847 + faab73c
commit 1d822a0
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/tests/tine20/Felamimail/Controller/AccountMock.php b/tests/tine20/Felamimail/Controller/AccountMock.php
@@ -53,7 +53,7 @@ protected function _inspectAfterCreate($_createdRecord, Tinebase_Record_Interfac
                     Tinebase_TransactionManager::getInstance()->unitTestRemoveTransactionable($smtpDb);
                 } catch (PDOException $e) {}
             }
-            $this->createdAccounts[] = $_createdRecord;
+            $this->createdAccounts[] = Tinebase_User::getInstance()->getFullUserById($_createdRecord->user_id);
         }
     }
 
@@ -63,9 +63,12 @@ public function cleanUp()
             return;
         }
 
-        /** @var Felamimail_Model_Account $account */
+        /** @var Tinebase_Model_FullUser $account */
         foreach ($this->createdAccounts as $account) {
-            Tinebase_EmailUser_XpropsFacade::deleteEmailUsers($account);
+            $account->setId($account->xprops()['emailUserIdImap']);
+            Tinebase_EmailUser::getInstance()->inspectDeleteUser($account);
+            $account->setId($account->xprops()['emailUserIdSmtp']);
+            Tinebase_EmailUser::getInstance(Tinebase_Config::SMTP)->inspectDeleteUser($account);
         }
         $this->createdAccounts = [];
     }