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

Merge branch 'support/3.2' into develop

Browse Source
This commit is contained in:
odain
2024-04-09 11:02:32 +02:00
parent 9cc8b75ffb 793f5c7cbe
commit 50b4388b8d
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
js/icon_select.js
View File

@@ -143,7 +143,6 @@ $(function()
_destroy: function()
{
this.element.removeClass( "itop-icon-select" );
this.oButton.button( "destroy" );
},
// _setOptions is called with a hash of all options that are changing

34
tests/php-unit-tests/unitary-tests/setup/unattended-install/InstallationFileServiceTest.php
View File

@@ -35,6 +35,12 @@ class InstallationFileServiceTest extends TestCase {
$oInstallationFileService = new \InstallationFileService($sPath, 'production', [], $bInstallationOptionalChoicesChecked);
$oInstallationFileService->ProcessInstallationChoices();
$aExpectedModules = [
'combodo-backoffice-darkmoon-theme',
'combodo-backoffice-fullmoon-high-contrast-theme',
'combodo-backoffice-fullmoon-protanopia-deuteranopia-theme',
'combodo-backoffice-fullmoon-tritanopia-theme',
'itop-structure',
'itop-themes-compat',
"itop-config-mgmt",
"itop-attachments",
"itop-profiles-itil",
@@ -66,9 +72,11 @@ class InstallationFileServiceTest extends TestCase {
if ($bInstallationOptionalChoicesChecked){
$aExpectedModules []= "itop-problem-mgmt";
$aExpectedModules []= "itop-knownerror-mgmt";
$aExpectedModules []= "itop-faq-light";
} else {
$aExpectedUnselectedModules []= "itop-problem-mgmt";
$aExpectedUnselectedModules []= "itop-knownerror-mgmt";
$aExpectedUnselectedModules []= "itop-faq-light";
}
sort($aExpectedModules);
@@ -93,6 +101,12 @@ class InstallationFileServiceTest extends TestCase {
$aSelectedModules = $oInstallationFileService->GetSelectedModules();
$aExpectedInstallationModules = [
'combodo-backoffice-darkmoon-theme',
'combodo-backoffice-fullmoon-high-contrast-theme',
'combodo-backoffice-fullmoon-protanopia-deuteranopia-theme',
'combodo-backoffice-fullmoon-tritanopia-theme',
'itop-structure',
'itop-themes-compat',
"itop-config-mgmt",
"itop-attachments",
"itop-profiles-itil",
@@ -116,6 +130,7 @@ class InstallationFileServiceTest extends TestCase {
if ($bInstallationOptionalChoicesChecked){
$aExpectedInstallationModules []= "itop-problem-mgmt";
$aExpectedInstallationModules []= "itop-knownerror-mgmt";
$aExpectedInstallationModules []= "itop-faq-light";
}
$aExpectedAuthenticationModules = [
@@ -132,7 +147,13 @@ class InstallationFileServiceTest extends TestCase {
];
$aAutoSelectedModules = [
'itop-bridge-cmdb-services',
'itop-bridge-virtualization-storage',
'itop-bridge-cmdb-ticket',
'itop-bridge-datacenter-mgmt-services',
'itop-bridge-endusers-devices-services',
'itop-bridge-storage-mgmt-services',
'itop-bridge-virtualization-mgmt-services',
];
$this->checkModuleList("installation.xml choices", $aExpectedInstallationModules, $aSelectedModules);
@@ -199,6 +220,12 @@ class InstallationFileServiceTest extends TestCase {
$aSelectedModules = $oInstallationFileService->GetSelectedModules();
$aExpectedInstallationModules = [
'combodo-backoffice-darkmoon-theme',
'combodo-backoffice-fullmoon-high-contrast-theme',
'combodo-backoffice-fullmoon-protanopia-deuteranopia-theme',
'combodo-backoffice-fullmoon-tritanopia-theme',
'itop-structure',
'itop-themes-compat',
"itop-config-mgmt",
"itop-attachments",
"itop-profiles-itil",
@@ -223,6 +250,7 @@ class InstallationFileServiceTest extends TestCase {
];
if ($bKnownMgtSelected){
$aExpectedInstallationModules []= "itop-knownerror-mgmt";
$aExpectedInstallationModules []= "itop-faq-light";
}
$aExpectedAuthenticationModules = [
@@ -239,7 +267,13 @@ class InstallationFileServiceTest extends TestCase {
];
$aAutoSelectedModules = [
'itop-bridge-cmdb-services',
'itop-bridge-virtualization-storage',
'itop-bridge-cmdb-ticket',
'itop-bridge-datacenter-mgmt-services',
'itop-bridge-endusers-devices-services',
'itop-bridge-storage-mgmt-services',
'itop-bridge-virtualization-mgmt-services',
];
$this->checkModuleList("installation.xml choices", $aExpectedInstallationModules, $aSelectedModules);