diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-03-07 09:01:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-07 09:01:44 +0100 |
| commit | 8d58356dc147a5c20682f0977752313dbbcf5d37 (patch) | |
| tree | 1425c6387f201553c7af2358fc35ab99f0e36609 /tests | |
| parent | 834f70fd7acefe76e2bf5475347d65a7c705d061 (diff) | |
| parent | 51ea3de8a7c090142e796350a240035931047a20 (diff) | |
| download | nextcloud-server-8d58356dc147a5c20682f0977752313dbbcf5d37.tar.gz nextcloud-server-8d58356dc147a5c20682f0977752313dbbcf5d37.zip | |
Merge pull request #43917 from nextcloud/fix/jsresourcelocator-apppath
fix(JSResourceLocator): Consider configured app roots for files
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/Template/JSResourceLocatorTest.php | 8 |
1 files changed, 4 insertions, 4 deletions
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()); |