From 51ea3de8a7c090142e796350a240035931047a20 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 29 Feb 2024 17:16:16 +0100 Subject: fix(JSResourceLocator): Consider configured app roots for files Signed-off-by: Ferdinand Thiessen --- tests/lib/Template/JSResourceLocatorTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/lib/Template/JSResourceLocatorTest.php') diff --git a/tests/lib/Template/JSResourceLocatorTest.php b/tests/lib/Template/JSResourceLocatorTest.php index f5af138060a..ae104d4d6ea 100644 --- a/tests/lib/Template/JSResourceLocatorTest.php +++ b/tests/lib/Template/JSResourceLocatorTest.php @@ -127,9 +127,9 @@ class JSResourceLocatorTest extends \Test\TestCase { $webRoot = $resource[1]; $file = $resource[2]; - $expectedRoot = $new_apps_path . '/test-js-app'; - $expectedWebRoot = \OC::$WEBROOT . '/js-apps-test/test-js-app'; - $expectedFile = 'test-file.js'; + $expectedRoot = $new_apps_path; + $expectedWebRoot = \OC::$WEBROOT . '/js-apps-test'; + $expectedFile = $appName . '/test-file.js'; $this->assertEquals($expectedRoot, $root, 'Ensure the app path symlink is resolved into the real path'); @@ -145,7 +145,7 @@ class JSResourceLocatorTest extends \Test\TestCase { ->method('getAppPath') ->with('core') ->willThrowException(new AppPathNotFoundException()); - $this->appManager->expects($this->once()) + $this->appManager->expects($this->atMost(1)) ->method('getAppWebPath') ->with('core') ->willThrowException(new AppPathNotFoundException()); -- cgit v1.2.3