From 737ff8e3f178e11ff173b5836b86e9e03ce8e640 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 17 Jan 2020 22:00:06 -0800
Subject: [PATCH] ThemesTest - Use more realistic expected-values

1. The expected value of `$civicrmBaseUrl` should not be blank. The old value was a fiction of
   the unit-test environment. Be more realistic.
2. The expected values for extension-generated URLs should abide the same `$civicrmBaseUrl` as others.
---
 tests/phpunit/Civi/Core/ThemesTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/phpunit/Civi/Core/ThemesTest.php b/tests/phpunit/Civi/Core/ThemesTest.php
index 80bc502d22..6278f60674 100644
--- a/tests/phpunit/Civi/Core/ThemesTest.php
+++ b/tests/phpunit/Civi/Core/ThemesTest.php
@@ -50,7 +50,7 @@ class ThemesTest extends \CiviUnitTestCase {
       ],
     ];
 
-    $civicrmBaseUrl = "";
+    $civicrmBaseUrl = rtrim(\Civi::paths()->getVariable('civicrm.root', 'url'), '/');
 
     // --- Library of tests ---
 
@@ -62,7 +62,7 @@ class ThemesTest extends \CiviUnitTestCase {
       [
         'civicrm-css/civicrm.css' => ["$civicrmBaseUrl/css/civicrm.css"],
         'civicrm-css/joomla.css' => ["$civicrmBaseUrl/css/joomla.css"],
-        'test.extension.uitest-files/foo.css' => ["/tests/extensions/test.extension.uitest/files/foo.css"],
+        'test.extension.uitest-files/foo.css' => ["$civicrmBaseUrl/tests/extensions/test.extension.uitest/files/foo.css"],
       ],
     ];
 
@@ -76,7 +76,7 @@ class ThemesTest extends \CiviUnitTestCase {
       [
         'civicrm-css/civicrm.css' => ["$civicrmBaseUrl/tests/phpunit/Civi/Core/Theme/judy/css/civicrm.css"],
         'civicrm-css/joomla.css' => ["$civicrmBaseUrl/css/joomla.css"],
-        'test.extension.uitest-files/foo.css' => ["/tests/extensions/test.extension.uitest/files/foo.css"],
+        'test.extension.uitest-files/foo.css' => ["$civicrmBaseUrl/tests/extensions/test.extension.uitest/files/foo.css"],
         // excluded
         'test.extension.uitest-files/ignoreme.css' => [],
       ],
@@ -90,7 +90,7 @@ class ThemesTest extends \CiviUnitTestCase {
       [
         'civicrm-css/civicrm.css' => ["$civicrmBaseUrl/css/civicrm.css"],
         'civicrm-css/joomla.css' => ["$civicrmBaseUrl/css/joomla.css"],
-        'test.extension.uitest-files/foo.css' => ["/tests/extensions/test.extension.uitest/files/foo.css"],
+        'test.extension.uitest-files/foo.css' => ["$civicrmBaseUrl/tests/extensions/test.extension.uitest/files/foo.css"],
       ],
     ];
 
@@ -102,7 +102,7 @@ class ThemesTest extends \CiviUnitTestCase {
       [
         'civicrm-css/civicrm.css' => [],
         'civicrm-css/joomla.css' => ["$civicrmBaseUrl/css/joomla.css"],
-        'test.extension.uitest-files/foo.css' => ["/tests/extensions/test.extension.uitest/files/foo.css"],
+        'test.extension.uitest-files/foo.css' => ["$civicrmBaseUrl/tests/extensions/test.extension.uitest/files/foo.css"],
       ],
     ];
 
@@ -116,7 +116,7 @@ class ThemesTest extends \CiviUnitTestCase {
         'civicrm-css/civicrm.css' => ["$civicrmBaseUrl/tests/phpunit/Civi/Core/Theme/liza/css/civicrm.css"],
         'civicrm-css/civicrm.min.css' => ["$civicrmBaseUrl/tests/phpunit/Civi/Core/Theme/liza/css/civicrm.min.css"],
         'civicrm-css/joomla.css' => ["$civicrmBaseUrl/css/joomla.css"],
-        'test.extension.uitest-files/foo.css' => ["/tests/phpunit/Civi/Core/Theme/liza/test.extension.uitest-files/foo.css"],
+        'test.extension.uitest-files/foo.css' => ["$civicrmBaseUrl/tests/phpunit/Civi/Core/Theme/liza/test.extension.uitest-files/foo.css"],
       ],
     ];
 
-- 
2.25.1