composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.0' into support/3.1

Browse Source
This commit is contained in:
Pierre Goiffon
2023-11-16 12:02:20 +01:00
parent 7798df0d53 0915081f50
commit 57b70e48bd
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/php-unit-tests/src/BaseTestCase/ItopDataTestCase.php
View File

@@ -143,6 +143,7 @@ abstract class ItopDataTestCase extends ItopTestCase
// Leave the place clean // Leave the place clean
\UserRights::Logoff(); \UserRights::Logoff();
$this->SetNonPublicStaticProperty(UserRights::class, 'm_aCacheUsers', []); $this->SetNonPublicStaticProperty(UserRights::class, 'm_aCacheUsers', []);
$this->ResetMetaModelQueyCacheGetObject();
foreach ($this->aEventListeners as $sListenerId) { foreach ($this->aEventListeners as $sListenerId) {
EventService::UnRegisterListener($sListenerId); EventService::UnRegisterListener($sListenerId);
@@ -153,6 +154,13 @@ abstract class ItopDataTestCase extends ItopTestCase
parent::tearDown(); parent::tearDown();
} }
/**
* Helper to reset the metamodel cache : for a class and a key it will contain the SQL query, that could include silo filter
*/
protected function ResetMetaModelQueyCacheGetObject() {
$this->SetNonPublicStaticProperty(MetaModel::class, 'aQueryCacheGetObject', []);
}
/** /**
* @inheritDoc * @inheritDoc
*/ */

8
tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
View File

@@ -671,14 +671,6 @@ class DBObjectTest extends ItopDataTestCase
} }
} }
/**
* Helper to reset the metamodel cache
* We might need to create something generic and add it to {@see UserRights::Logoff()} ?
*/
private function ResetMetaModelQueyCacheGetObject() {
$this->SetNonPublicStaticProperty(MetaModel::class, 'aQueryCacheGetObject', []);
}
private function CreateDemoOrgUser(Organization $oDemoOrg, string $sProfileId): User private function CreateDemoOrgUser(Organization $oDemoOrg, string $sProfileId): User
{ {
utils::GetConfig()->SetModuleSetting('authent-local', 'password_validation.pattern', ''); utils::GetConfig()->SetModuleSetting('authent-local', 'password_validation.pattern', '');