upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-21 06:08:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

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

Browse source 
Fix 32bits ci
This commit is contained in:
Arthur Schiwon 2023-05-03 10:34:04 +02:00 committed by GitHub
commit 7fcf42ad3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/phpunit-32bits.yml vendored
View file

@ -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"

9
tests/lib/Template/JSResourceLocatorTest.php
View file

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