upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-06 07:21:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Merge pull request #38409 from nextcloud/backport/38291/stable27

Browse source
This commit is contained in:
John Molakvoæ 2023-06-01 10:05:11 +02:00 committed by GitHub
commit 1a76ea188d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/theming/lib/Util.php
View file

@ -190,7 +190,7 @@ class Util {
if ($this->config->getAppValue('theming', 'logoMime', '') !== '') {
$logoFile = null;
try {
$folder = $this->appData->getFolder('images');
$folder = $this->appData->getFolder('global/images');
return $folder->getFile('logo');
} catch (NotFoundException $e) {
}

6
apps/theming/tests/IconBuilderTest.php
View file

@ -103,7 +103,7 @@ class IconBuilderTest extends TestCase {
->willReturn($color);
$this->appData->expects($this->once())
->method('getFolder')
->with('images')
->with('global/images')
->willThrowException(new NotFoundException());
$expectedIcon = new \Imagick(realpath(dirname(__FILE__)). "/data/" . $file);
@ -132,7 +132,7 @@ class IconBuilderTest extends TestCase {
->willReturn($color);
$this->appData->expects($this->once())
->method('getFolder')
->with('images')
->with('global/images')
->willThrowException(new NotFoundException());
$expectedIcon = new \Imagick(realpath(dirname(__FILE__)). "/data/" . $file);
@ -165,7 +165,7 @@ class IconBuilderTest extends TestCase {
->willReturn($color);
$this->appData->expects($this->once())
->method('getFolder')
->with('images')
->with('global/images')
->willThrowException(new NotFoundException());
$expectedIcon = new \Imagick(realpath(dirname(__FILE__)). "/data/" . $file);

4
apps/theming/tests/UtilTest.php
View file

@ -153,7 +153,7 @@ class UtilTest extends TestCase {
public function testGetAppIcon($app, $expected) {
$this->appData->expects($this->any())
->method('getFolder')
->with('images')
->with('global/images')
->willThrowException(new NotFoundException());
$this->appManager->expects($this->once())
->method('getAppPath')
@ -180,7 +180,7 @@ class UtilTest extends TestCase {
->willReturn($file);
$this->appData->expects($this->once())
->method('getFolder')
->with('images')
->with('global/images')
->willReturn($folder);
$icon = $this->util->getAppIcon('noapplikethis');
$this->assertEquals($file, $icon);