From 0d4d8d546da6cd61d2ad331f059bdbc8aa3b02cf Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 10 Mar 2020 14:13:30 -0700 Subject: [PATCH] E2E_Extern_CliRunnerTest - Update to match change in `./` Per 16735, the interpretation of `getPath('[foo]/.`)` changed slightly - from: * 5.22: Inconsistent/undefined tail end (may or may not have trailing `/`) * 5.23.0: Defined to always end with `/` * #16735: Defined to never end with `/` --- tests/phpunit/E2E/Extern/CliRunnerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/phpunit/E2E/Extern/CliRunnerTest.php b/tests/phpunit/E2E/Extern/CliRunnerTest.php index 0b153dd98d..487ef853a3 100644 --- a/tests/phpunit/E2E/Extern/CliRunnerTest.php +++ b/tests/phpunit/E2E/Extern/CliRunnerTest.php @@ -101,7 +101,7 @@ class E2E_Extern_CliRunnerTest extends CiviEndToEndTestCase { $ufrUrl = $this->callRunnerJson($r, 'CRM_Core_Config::singleton()->userFrameworkResourceURL'); $crmUrl = $this->callRunnerJson($r, 'Civi::paths()->getUrl("[civicrm.root]/.")'); - $this->assertEquals($crmUrl, $ufrUrl); + $this->assertEquals(rtrim($crmUrl, '/'), rtrim($ufrUrl, '/')); } /** -- 2.25.1