diff options
| author | Remi Collet <remi@remirepo.net> | 2019-01-04 17:02:03 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-01-04 17:02:03 +0100 |
| commit | 4f9dcd0f8eec44bcda8e4cbb9b40f17aca483754 (patch) | |
| tree | 4e42e9dfef2e641c1024e5b2bba4c16279d5389d | |
| parent | 250da24dbd18bf83b88292e5a913aba666d1cef9 (diff) | |
add the patch
| -rw-r--r-- | 5200.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/5200.patch b/5200.patch new file mode 100644 index 0000000..7ed7d76 --- /dev/null +++ b/5200.patch @@ -0,0 +1,31 @@ +From 53de3f8e261cbc449deb5e603fe7d0f1c4c273ec Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 4 Jan 2019 16:08:52 +0100 +Subject: [PATCH] fix paths used for css/js test + +--- + tests/units/Html.php | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/units/Html.php b/tests/units/Html.php +index ee17710b31..c5d2f22068 100644 +--- a/tests/units/Html.php ++++ b/tests/units/Html.php +@@ -421,7 +421,7 @@ public function testCss() { + 'other.css', + 'other-min.css' + ]; +- $dir = str_replace(GLPI_ROOT, '', GLPI_TMP_DIR); ++ $dir = str_replace(realpath(GLPI_ROOT), '', realpath(GLPI_TMP_DIR)); + $base_expected = '<link rel="stylesheet" type="text/css" href="'. + $CFG_GLPI['root_doc'] . $dir .'/%url?v='. GLPI_VERSION .'" %attrs>'; + $base_attrs = 'media="all"'; +@@ -530,7 +530,7 @@ public function testScript() { + 'other.js', + 'other-min.js' + ]; +- $dir = str_replace(GLPI_ROOT, '', GLPI_TMP_DIR); ++ $dir = str_replace(realpath(GLPI_ROOT), '', realpath(GLPI_TMP_DIR)); + $base_expected = '<script type="text/javascript" src="'. + $CFG_GLPI['root_doc'] . $dir .'/%url?v='. GLPI_VERSION .'"></script>'; + |