Browse Source

Fix unit tests for the theming app

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
tags/v25.0.0beta1
Carl Schwan 1 year ago
parent
commit
13ca01ee12
No account linked to committer's email address

+ 6
- 0
apps/theming/css/default.css View File

@@ -59,4 +59,10 @@
--primary-invert-if-bright: no;
--background-invert-if-dark: no;
--background-invert-if-bright: invert(100%);
--image-logo: url('/core/img/logo/logo.png?v=0');
--image-logoheader: url('/core/img/logo/logo.png?v=0');
--image-favicon: url('/core/img/logo/logo.png?v=0');
--image-background-size: cover;
--image-background: url('/core/img/background.png?v=0');
--image-login-background: url('/core/img/background.png?v=0');
}

+ 0
- 1
apps/theming/lib/Themes/DefaultTheme.php View File

@@ -191,7 +191,6 @@ class DefaultTheme implements ITheme {
'--background-invert-if-bright' => 'invert(100%)',
];

// Register image variables only if custom-defined
$backgroundDeleted = $this->config->getAppValue('theming', 'backgroundMime', '') === 'backgroundColor';
foreach(['logo', 'logoheader', 'favicon', 'background'] as $image) {
// If primary as background has been request, let's not define the background image

+ 1
- 1
apps/theming/tests/ImageManagerTest.php View File

@@ -307,7 +307,7 @@ class ImageManagerTest extends TestCase {
foreach ($folders as $index => $folder) {
$folder->expects($this->any())
->method('getName')
->willReturn($index);
->willReturn((string)$index);
}
$folders[0]->expects($this->once())->method('delete');
$folders[1]->expects($this->once())->method('delete');

+ 18
- 1
apps/theming/tests/Themes/DefaultThemeTest.php View File

@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Theming\Tests\Service;
namespace OCA\Theming\Tests;

use OC\App\AppManager;
use OCA\Theming\ImageManager;
@@ -68,6 +68,23 @@ class DefaultThemeTest extends TestCase {
->method('getColorPrimary')
->willReturn('#0082c9');

$this->imageManager->expects($this->any())
->method('getImageUrl')
->willReturnCallback(function (string $name): string {
switch ($name) {
case 'logo':
case 'logoheader':
case 'favicon':
return '/core/img/logo/logo.png?v=0';
case 'background':
case 'login-background':
return '/core/img/background.png?v=0';
default:
return '';
}
});


$this->l10n
->expects($this->any())
->method('t')

Loading…
Cancel
Save