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

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

Browse Source 
# Conflicts:
#	tests/php-unit-tests/src/BaseTestCase/ItopDataTestCase.php
This commit is contained in:
Pierre Goiffon
2023-11-16 11:29:31 +01:00
parent 8f61c02cbe a23d629e31
commit 7798df0d53
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -451,7 +451,6 @@ class DBObjectTest extends ItopDataTestCase
/**
* @covers DBObject::CheckChangedExtKeysValues()
* @runInSeparateProcess MetaModel::GetObject returning wrong values :(
*/
public function testCheckExtKeysSiloOnAttributeExternalKey()
{
@@ -529,7 +528,6 @@ class DBObjectTest extends ItopDataTestCase
/**
* @covers DBObject::CheckChangedExtKeysValues()
* @runInSeparateProcess MetaModel::GetObject returning wrong values :(
*/
public function testCheckExtKeysOnAttributeLinkedSetIndirect()
{
@@ -631,7 +629,6 @@ class DBObjectTest extends ItopDataTestCase
/**
* @covers DBObject::CheckChangedExtKeysValues()
* @runInSeparateProcess MetaModel::GetObject returning wrong values :(
*/
public function testCheckExtKeysSiloOnAttributeObjectKey()
{
@@ -685,7 +682,7 @@ class DBObjectTest extends ItopDataTestCase
private function CreateDemoOrgUser(Organization $oDemoOrg, string $sProfileId): User
{
utils::GetConfig()->SetModuleSetting('authent-local', 'password_validation.pattern', '');
$oUserWithAllowedOrgs = $this->CreateContactlessUser('demo_test_' . __CLASS__, $sProfileId);
$oUserWithAllowedOrgs = $this->CreateContactlessUser('demo_test_' . uniqid(__CLASS__, true), $sProfileId);
/** @var \URP_UserOrg $oUserOrg */
$oUserOrg = \MetaModel::NewObject('URP_UserOrg', ['allowed_org_id' => $oDemoOrg->GetKey(),]);
$oAllowedOrgList = $oUserWithAllowedOrgs->Get('allowed_org_list');