summaryrefslogtreecommitdiffstats
path: root/5200.patch
blob: 7ed7d763a5c9368a9d62b6a30cdae9aeccabdbfb (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
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>';