summaryrefslogtreecommitdiffstats
path: root/tests/lib
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2023-05-03 10:34:04 +0200
committerGitHub <noreply@github.com>2023-05-03 10:34:04 +0200
commit7fcf42ad3fb02ef2d089774170b2b0f39876aaba (patch)
tree6119ea150cf9b3ebcdd5182f89d2b3988690fedb /tests/lib
parentef87dfc478c53c293cb09756201f2ea9dd2b67b1 (diff)
parente252182d8046ce0254dc37137d77e1b30c2fd387 (diff)
downloadnextcloud-server-7fcf42ad3fb02ef2d089774170b2b0f39876aaba.tar.gz
nextcloud-server-7fcf42ad3fb02ef2d089774170b2b0f39876aaba.zip
Merge pull request #38024 from nextcloud/fix/fix-32bits-ci
Fix 32bits ci
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib/Template/JSResourceLocatorTest.php9
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/lib/Template/JSResourceLocatorTest.php b/tests/lib/Template/JSResourceLocatorTest.php
index 627fe676680..9ac6a32e22c 100644
--- a/tests/lib/Template/JSResourceLocatorTest.php
+++ b/tests/lib/Template/JSResourceLocatorTest.php
@@ -135,9 +135,8 @@ class JSResourceLocatorTest extends \Test\TestCase {
$this->assertEquals($expectedWebRoot, $webRoot);
$this->assertEquals($expectedFile, $file);
- array_pop(\OC::$APPSROOTS);
- //unlink($new_apps_path_symlink);
- //$this->rrmdir($new_apps_path);
+ unlink($new_apps_path_symlink);
+ $this->rrmdir($new_apps_path);
}
public function testFindModuleJSWithFallback() {
@@ -165,7 +164,6 @@ class JSResourceLocatorTest extends \Test\TestCase {
$resources = $locator->getResources();
$this->assertCount(3, $resources);
- $expectedRoot = $new_apps_path . '/test-js-app';
$expectedWebRoot = \OC::$WEBROOT . '/js-apps-test/test-js-app';
$expectedFiles = ['module.mjs', 'both.mjs', 'plain.js'];
@@ -173,8 +171,7 @@ class JSResourceLocatorTest extends \Test\TestCase {
$this->assertEquals($expectedWebRoot, $resources[$idx][1]);
$this->assertEquals($expectedFiles[$idx], $resources[$idx][2]);
}
-
- array_pop(\OC::$APPSROOTS);
+
$this->rrmdir($new_apps_path);
}
}