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.1' into support/3.2

Browse Source 
# Conflicts:
#	css/setup.css
#	setup/setuppage.class.inc.php
This commit is contained in:
Molkobain
2024-03-21 15:58:00 +01:00
parent d57fd05552 3653a4bc90
commit 673b01585d
5 changed files with 161 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/php-unit-tests/unitary-tests/sources/Application/WebPage/WebPageTest.php
View File

@@ -58,6 +58,11 @@ class WebPageTest extends ItopDataTestCase
"js/utils.js",
1,
],
"LinkScriptFromAppRoot: Relative URI of existing file with query params should be completed / added" => [
"LinkScriptFromAppRoot",
"js/utils.js?foo=bar",
1,
],
"LinkScriptFromAppRoot: Relative URI of NON existing file should be ignored" => [
"LinkScriptFromAppRoot",
"js/some-file.js",
@@ -80,6 +85,11 @@ class WebPageTest extends ItopDataTestCase
"itop-portal-base/portal/public/js/toolbox.js",
1,
],
"LinkScriptFromModule: Relative URI of existing file with query params should be completed / added" => [
"LinkScriptFromModule",
"itop-portal-base/portal/public/js/toolbox.js?foo=bar",
1,
],
"LinkScriptFromModule: Relative URI of NON existing file should be completed / added" => [
"LinkScriptFromModule",
"some-module/asset/js/some-file.js",
@@ -107,6 +117,11 @@ class WebPageTest extends ItopDataTestCase
"https://external.server/file.js",
1,
],
"LinkScriptFromURI: Absolute URI with query params should be added" => [
"LinkScriptFromURI",
"https://external.server/file.js?foo=bar",
1,
],
];
}
@@ -148,6 +163,11 @@ class WebPageTest extends ItopDataTestCase
"css/login.css",
1,
],
"LinkStylesheetFromAppRoot: Relative URI of existing file with query params should be completed / added" => [
"LinkStylesheetFromAppRoot",
"css/login.css?foo=bar",
1,
],
"LinkStylesheetFromAppRoot: Relative URI of NON existing file should be ignored" => [
"LinkStylesheetFromAppRoot",
"css/some-file.css",
@@ -170,6 +190,11 @@ class WebPageTest extends ItopDataTestCase
"itop-portal-base/portal/public/css/portal.css",
1,
],
"LinkStylesheetFromModule: Relative URI of existing file with query params should be completed / added" => [
"LinkStylesheetFromModule",
"itop-portal-base/portal/public/css/portal.css?foo=bar",
1,
],
"LinkStylesheetFromModule: Relative URI of NON existing file should be completed / added" => [
"LinkStylesheetFromModule",
"some-module/asset/js/some-file.js",
@@ -197,6 +222,11 @@ class WebPageTest extends ItopDataTestCase
"https://external.server/file.css",
1,
],
"LinkStylesheetFromURI: Absolute URI with query params should be added" => [
"LinkStylesheetFromURI",
"https://external.server/file.css?foo=bar",
1,
],
];
}
}