Merge pull request #38024 from nextcloud/fix/fix-32bits-ci

Fix 32bits ci

.github/workflows/phpunit-32bits.yml

@@ -1,6 +1,10 @@
 name: PHPUnit 32bits
 
 on:
+  pull_request:
+    paths:
+      - 'version.php'
+      - '.github/workflows/phpunit-32bits.yml'
   workflow_dispatch:
   schedule:
     - cron: "15 1 * * 1-6"

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);
 	}
 }