composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/uninstallation

Browse Source
This commit is contained in:
odain
2026-04-28 10:24:50 +02:00
parent 7e0e357713 befe294986
commit 16108a80fc
222 changed files with 11170 additions and 4756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/manual-visual-tests/Backoffice/RenderAllUiBlocks.php
View File

@@ -22,6 +22,7 @@
namespace Combodo\iTop\Test\VisualTest\Backoffice;
use Combodo\iTop\Application\Branding;
use Combodo\iTop\Application\UI\Base\Component\Alert\AlertUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Badge\Badge;
use Combodo\iTop\Application\UI\Base\Component\Badge\BadgeUIBlockFactory;
@@ -411,7 +412,8 @@ $oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral('Title example 1', 1));
$oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral('Title example 2', 2));
$oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral('Title example 3', 3));
$oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral('Title example 4', 4));
$oPage->AddUiBlock(TitleUIBlockFactory::MakeNeutral('Title example 5', 5));
$oPage->AddUiBlock(TitleUIBlockFactory::MakeForPageWithIcon('Title example 5', MetaModel::GetClassIcon('Organization', false)));
$oPage->AddUiBlock(TitleUIBlockFactory::MakeForPageWithIcon('Title example 6', Branding::GetFullMainLogoAbsoluteUrl()));
/////////
// DataTable

6
tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
View File

@@ -45,11 +45,7 @@ class DBBackupTest extends ItopTestCase
$oConfigToTest->Set('db_tls.enabled', false);
$sCliArgsNoTls = DBBackup::GetMysqlCliTlsOptions($oConfigToTest);
if (CMDBSource::IsSslModeDBVersion()) {
$this->assertEquals(' --skip-ssl', $sCliArgsNoTls);
} else {
$this->assertEmpty($sCliArgsNoTls);
}
$this->assertEmpty($sCliArgsNoTls);
}
/**