IConfig $config,
DefaultTheme $defaultTheme,
DarkTheme $darkTheme,
- DarkHighContrastTheme $darkHighContrastTheme,
HighContrastTheme $highContrastTheme,
+ DarkHighContrastTheme $darkHighContrastTheme,
DyslexiaFont $dyslexiaFont) {
$this->userSession = $userSession;
$this->config = $config;
* Enable a theme for the logged-in user
*
* @param ITheme $theme the theme to enable
+ * @return string[] the enabled themes
*/
- public function enableTheme(ITheme $theme): void {
+ public function enableTheme(ITheme $theme): array {
$themesIds = $this->getEnabledThemes();
+ // If already enabled, ignore
+ if (in_array($theme->getId(), $themesIds)) {
+ return $themesIds;
+ }
+
/** @var ITheme[] */
$themes = array_map(function($themeId) {
return $this->getThemes()[$themeId];
}, $themesIds);
// Filtering all themes with the same type
- $filteredThemes = array_filter($themes, function($t) use ($theme) {
+ $filteredThemes = array_filter($themes, function(ITheme $t) use ($theme) {
return $theme->getType() === $t->getType();
});
- // Disable all the other themes of the same type
- // as there can only be one enabled at the same time
- foreach ($filteredThemes as $t) {
- $this->disableTheme($t);
- }
+ // Retrieve IDs only
+ $filteredThemesIds = array_map(function(ITheme $t) {
+ return $t->getId();
+ }, $filteredThemes);
- $this->setEnabledThemes([...$this->getEnabledThemes(), $theme->getId()]);
+ $enabledThemes = [...array_diff($themesIds, $filteredThemesIds), $theme->getId()];
+ $this->setEnabledThemes($enabledThemes);
+
+ return $enabledThemes;
}
/**
* Disable a theme for the logged-in user
*
* @param ITheme $theme the theme to disable
+ * @return string[] the enabled themes
*/
- public function disableTheme(ITheme $theme): void {
- // Using keys as it's faster
- $themes = $this->getEnabledThemes();
+ public function disableTheme(ITheme $theme): array {
+ $themesIds = $this->getEnabledThemes();
// If enabled, removing it
- if (in_array($theme->getId(), $themes)) {
- $this->setEnabledThemes(array_filter($themes, function($themeId) use ($theme) {
- return $themeId !== $theme->getId();
- }));
+ if (in_array($theme->getId(), $themesIds)) {
+ $enabledThemes = array_diff($themesIds, [$theme->getId()]);
+ $this->setEnabledThemes($enabledThemes);
+ return $enabledThemes;
}
+
+ return $themesIds;
}
/**
*/
public function getEnabledThemes(): array {
$user = $this->userSession->getUser();
+ if ($user === null) {
+ return [];
+ }
+
try {
return json_decode($this->config->getUserValue($user->getUID(), Application::APP_ID, 'enabled-themes', '[]'));
} catch (\Exception $e) {
*/
private function setEnabledThemes(array $themes): void {
$user = $this->userSession->getUser();
- $this->config->setUserValue($user->getUID(), Application::APP_ID, 'enabled-themes', json_encode(array_unique($themes)));
+ $this->config->setUserValue($user->getUID(), Application::APP_ID, 'enabled-themes', json_encode(array_unique(array_values($themes))));
}
}
public function calculateLuminance(string $color): float {
[$red, $green, $blue] = $this->hexToRGB($color);
$hsl = $this->toHSL($red, $green, $blue);
- return $hsl[2] / 100;
+ return $hsl[2];
}
/**
namespace OCA\Theming\Tests\Controller;
use OC\L10N\L10N;
-use OC\Template\SCSSCacher;
use OCA\Theming\Controller\ThemingController;
+use OCA\Theming\Service\ThemesService;
use OCA\Theming\ImageManager;
use OCA\Theming\ThemingDefaults;
use OCP\App\IAppManager;
private $appData;
/** @var ImageManager|MockObject */
private $imageManager;
- /** @var SCSSCacher */
- private $scssCacher;
- /** @var IURLGenerator */
+ /** @var IURLGenerator|MockObject */
private $urlGenerator;
+ /** @var ThemeService|MockObject */
+ private $themesService;
protected function setUp(): void {
$this->request = $this->createMock(IRequest::class);
$this->appData = $this->createMock(IAppData::class);
$this->appManager = $this->createMock(IAppManager::class);
$this->tempManager = \OC::$server->getTempManager();
- $this->scssCacher = $this->createMock(SCSSCacher::class);
$this->urlGenerator = $this->createMock(IURLGenerator::class);
$this->imageManager = $this->createMock(ImageManager::class);
+ $this->themesService = $this->createMock(ThemesService::class);
$timeFactory = $this->createMock(ITimeFactory::class);
$timeFactory->expects($this->any())
$this->l10n,
$this->tempManager,
$this->appData,
- $this->scssCacher,
$this->urlGenerator,
$this->appManager,
- $this->imageManager
+ $this->imageManager,
+ $this->themesService,
);
parent::setUp();
->willReturnCallback(function ($str) {
return $str;
});
- $this->scssCacher
- ->expects($this->once())
- ->method('getCachedSCSS')
- ->with('core', '/core/css/css-variables.scss')
- ->willReturn('/core/css/someHash-css-variables.scss');
- $this->urlGenerator
- ->expects($this->once())
- ->method('linkTo')
- ->with('', '/core/css/someHash-css-variables.scss')
- ->willReturn('/nextcloudWebroot/core/css/someHash-css-variables.scss');
$expected = new DataResponse(
[
'data' =>
[
'message' => $message,
- 'serverCssUrl' => '/nextcloudWebroot/core/css/someHash-css-variables.scss',
],
'status' => 'success',
]
return $str;
});
- $this->urlGenerator->expects($this->once())
- ->method('linkTo')
- ->willReturn('serverCss');
$this->imageManager->expects($this->once())
->method('getImageUrl')
->with('logo')
'name' => 'logo.svg',
'message' => 'Saved',
'url' => 'imageUrl',
- 'serverCssUrl' => 'serverCss'
],
'status' => 'success'
]
$this->imageManager->expects($this->once())
->method('updateImage');
- $this->urlGenerator->expects($this->once())
- ->method('linkTo')
- ->willReturn('serverCss');
$this->imageManager->expects($this->once())
->method('getImageUrl')
->with('background')
'name' => 'logo.svg',
'message' => 'Saved',
'url' => 'imageUrl',
- 'serverCssUrl' => 'serverCss'
],
'status' => 'success'
]
->method('undo')
->with('MySetting')
->willReturn('MyValue');
- $this->scssCacher
- ->expects($this->once())
- ->method('getCachedSCSS')
- ->with('core', '/core/css/css-variables.scss')
- ->willReturn('/core/css/someHash-css-variables.scss');
- $this->urlGenerator
- ->expects($this->once())
- ->method('linkTo')
- ->with('', '/core/css/someHash-css-variables.scss')
- ->willReturn('/nextcloudWebroot/core/css/someHash-css-variables.scss');
$expected = new DataResponse(
[
'data' =>
[
'value' => 'MyValue',
- 'message' => 'Saved',
- 'serverCssUrl' => '/nextcloudWebroot/core/css/someHash-css-variables.scss',
+ 'message' => 'Saved'
],
'status' => 'success'
]
->method('undo')
->with($value)
->willReturn($value);
- $this->scssCacher
- ->expects($this->once())
- ->method('getCachedSCSS')
- ->with('core', '/core/css/css-variables.scss')
- ->willReturn('/core/css/someHash-css-variables.scss');
- $this->urlGenerator
- ->expects($this->once())
- ->method('linkTo')
- ->with('', '/core/css/someHash-css-variables.scss')
- ->willReturn('/nextcloudWebroot/core/css/someHash-css-variables.scss');
$expected = new DataResponse(
[
[
'value' => $value,
'message' => 'Saved',
- 'serverCssUrl' => '/nextcloudWebroot/core/css/someHash-css-variables.scss',
],
'status' => 'success'
]
@$this->assertEquals($expected, $this->themingController->getImage('background'));
}
-
- public function testGetStylesheet() {
- $this->appManager->expects($this->once())->method('getAppPath')->with('theming')->willReturn(\OC::$SERVERROOT . '/theming');
- $file = $this->createMock(ISimpleFile::class);
- $file->expects($this->any())->method('getName')->willReturn('theming.css');
- $file->expects($this->any())->method('getMTime')->willReturn(42);
- $file->expects($this->any())->method('getContent')->willReturn('compiled');
- $this->scssCacher->expects($this->once())->method('process')->willReturn(true);
- $this->scssCacher->expects($this->once())->method('getCachedCSS')->willReturn($file);
-
- $response = new Http\FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'text/css']);
- $response->cacheFor(86400);
-
- $actual = $this->themingController->getStylesheet();
- $this->assertEquals($response, $actual);
- }
-
- public function testGetStylesheetFails() {
- $this->appManager->expects($this->once())->method('getAppPath')->with('theming')->willReturn(\OC::$SERVERROOT . '/theming');
- $file = $this->createMock(ISimpleFile::class);
- $file->expects($this->any())->method('getName')->willReturn('theming.css');
- $file->expects($this->any())->method('getMTime')->willReturn(42);
- $file->expects($this->any())->method('getContent')->willReturn('compiled');
- $this->scssCacher->expects($this->once())->method('process')->willReturn(true);
- $this->scssCacher->expects($this->once())->method('getCachedCSS')->willThrowException(new NotFoundException());
- $response = new Http\NotFoundResponse();
-
- $actual = $this->themingController->getStylesheet();
- $this->assertEquals($response, $actual);
- }
-
- public function testGetStylesheetOutsideServerroot() {
- $this->appManager->expects($this->once())->method('getAppPath')->with('theming')->willReturn('/outside/serverroot/theming');
- $file = $this->createMock(ISimpleFile::class);
- $file->expects($this->any())->method('getName')->willReturn('theming.css');
- $file->expects($this->any())->method('getMTime')->willReturn(42);
- $file->expects($this->any())->method('getContent')->willReturn('compiled');
- $this->scssCacher->expects($this->once())->method('process')->with('/outside/serverroot/theming', 'css/theming.scss', 'theming')->willReturn(true);
- $this->scssCacher->expects($this->once())->method('getCachedCSS')->willReturn($file);
-
- $response = new Http\FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => 'text/css']);
- $response->cacheFor(86400);
-
- $actual = $this->themingController->getStylesheet();
- $this->assertEquals($response, $actual);
- }
-
public function testGetManifest() {
$this->config
->expects($this->once())
--- /dev/null
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @author Bjoern Schiessle <bjoern@schiessle.org>
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @author Daniel Calviño Sánchez <danxuliu@gmail.com>
+ * @author Joas Schilling <coding@schilljs.com>
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ * @author Julius Haertl <jus@bitgrid.net>
+ * @author Julius Härtl <jus@bitgrid.net>
+ * @author Kyle Fazzari <kyrofa@ubuntu.com>
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ * @author Michael Weimann <mail@michael-weimann.eu>
+ * @author rakekniven <mark.ziegler@rakekniven.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Theming\Tests\Controller;
+
+use OCA\Theming\Controller\UserThemeController;
+use OCA\Theming\ITheme;
+use OCA\Theming\Themes\DarkHighContrastTheme;
+use OCA\Theming\Themes\DarkTheme;
+use OCA\Theming\Themes\DefaultTheme;
+use OCA\Theming\Themes\DyslexiaFont;
+use OCA\Theming\Themes\HighContrastTheme;
+use OCA\Theming\Service\ThemesService;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\OCS\OCSBadRequestException;
+use OCP\IConfig;
+use OCP\IRequest;
+use OCP\IUser;
+use OCP\IUserSession;
+use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
+
+class UserThemeControllerTest extends TestCase {
+ /** @var UserThemeController */
+ private $userThemeController;
+
+ /** @var IRequest|MockObject */
+ private $request;
+ /** @var IConfig|MockObject */
+ private $config;
+ /** @var IUserSession|MockObject */
+ private $userSession;
+ /** @var ThemeService|MockObject */
+ private $themesService;
+
+ /** @var ITheme[] */
+ private $themes;
+
+ protected function setUp(): void {
+ $this->request = $this->createMock(IRequest::class);
+ $this->config = $this->createMock(IConfig::class);
+ $this->userSession = $this->createMock(IUserSession::class);
+ $this->themesService = $this->createMock(ThemesService::class);
+
+ $this->themes = [
+ 'default' => $this->createMock(DefaultTheme::class),
+ 'dark' => $this->createMock(DarkTheme::class),
+ 'highcontrast' => $this->createMock(HighContrastTheme::class),
+ 'dark-highcontrast' => $this->createMock(DarkHighContrastTheme::class),
+ 'opendyslexic' => $this->createMock(DyslexiaFont::class),
+ ];
+
+ $user = $this->createMock(IUser::class);
+ $this->userSession->expects($this->any())
+ ->method('getUser')
+ ->willReturn($user);
+ $user->expects($this->any())
+ ->method('getUID')
+ ->willReturn('user');
+
+ $this->userThemeController = new UserThemeController(
+ 'theming',
+ $this->request,
+ $this->config,
+ $this->userSession,
+ $this->themesService,
+ );
+
+ parent::setUp();
+ }
+
+ public function dataTestThemes() {
+ return [
+ ['default'],
+ ['dark'],
+ ['highcontrast'],
+ ['dark-highcontrast'],
+ ['opendyslexic'],
+ ['', OCSBadRequestException::class],
+ ['badTheme', OCSBadRequestException::class],
+ ];
+ }
+
+ /**
+ * @dataProvider dataTestThemes
+ *
+ * @param string $themeId
+ * @param string $exception
+ */
+ public function testEnableTheme($themeId, string $exception = null) {
+ $this->themesService
+ ->expects($this->any())
+ ->method('getThemes')
+ ->willReturn($this->themes);
+
+ if ($exception) {
+ $this->expectException($exception);
+ }
+
+ $expected = new DataResponse();
+ $this->assertEquals($expected, $this->userThemeController->enableTheme($themeId));
+ }
+
+ /**
+ * @dataProvider dataTestThemes
+ *
+ * @param string $themeId
+ * @param string $exception
+ */
+ public function testDisableTheme($themeId, string $exception = null) {
+ $this->themesService
+ ->expects($this->any())
+ ->method('getThemes')
+ ->willReturn($this->themes);
+
+ if ($exception) {
+ $this->expectException($exception);
+ }
+
+ $expected = new DataResponse();
+ $this->assertEquals($expected, $this->userThemeController->disableTheme($themeId));
+ }
+}
--- /dev/null
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @author Bjoern Schiessle <bjoern@schiessle.org>
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @author Daniel Calviño Sánchez <danxuliu@gmail.com>
+ * @author Joas Schilling <coding@schilljs.com>
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ * @author Julius Haertl <jus@bitgrid.net>
+ * @author Julius Härtl <jus@bitgrid.net>
+ * @author Kyle Fazzari <kyrofa@ubuntu.com>
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ * @author Michael Weimann <mail@michael-weimann.eu>
+ * @author rakekniven <mark.ziegler@rakekniven.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Theming\Tests\Service;
+
+use OCA\Theming\AppInfo\Application;
+use OCA\Theming\ImageManager;
+use OCA\Theming\ITheme;
+use OCA\Theming\Themes\DarkHighContrastTheme;
+use OCA\Theming\Themes\DarkTheme;
+use OCA\Theming\Themes\DefaultTheme;
+use OCA\Theming\Themes\DyslexiaFont;
+use OCA\Theming\Themes\HighContrastTheme;
+use OCA\Theming\Service\ThemesService;
+use OCA\Theming\ThemingDefaults;
+use OCA\Theming\Util;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\OCS\OCSBadRequestException;
+use OCP\IConfig;
+use OCP\IL10N;
+use OCP\IRequest;
+use OCP\IURLGenerator;
+use OCP\IUser;
+use OCP\IUserSession;
+use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
+
+class UserThemeControllerTest extends TestCase {
+ /** @var ThemesService */
+ private $themesService;
+
+ /** @var IUserSession|MockObject */
+ private $userSession;
+ /** @var IConfig|MockObject */
+ private $config;
+ /** @var ThemingDefaults|MockObject */
+ private $themingDefaults;
+
+ /** @var ITheme[] */
+ private $themes;
+
+ protected function setUp(): void {
+ $this->userSession = $this->createMock(IUserSession::class);
+ $this->config = $this->createMock(IConfig::class);
+ $this->themingDefaults = $this->createMock(ThemingDefaults::class);
+
+ $this->themingDefaults->expects($this->any())
+ ->method('getColorPrimary')
+ ->willReturn('#0082c9');
+
+ $this->initThemes();
+
+ $this->themesService = new ThemesService(
+ $this->userSession,
+ $this->config,
+ ...array_values($this->themes)
+ );
+
+ parent::setUp();
+ }
+
+ public function testGetThemes() {
+ $expected = [
+ 'default',
+ 'dark',
+ 'highcontrast',
+ 'dark-highcontrast',
+ 'opendyslexic',
+ ];
+ $this->assertEquals($expected, array_keys($this->themesService->getThemes()));
+ }
+
+
+ public function dataTestEnableTheme() {
+ return [
+ ['dark', [], ['dark']],
+ ['dark', ['dark'], ['dark']],
+ ['opendyslexic', ['dark'], ['dark', 'opendyslexic']],
+ ['dark', ['highcontrast', 'opendyslexic'], ['opendyslexic', 'dark']],
+ ];
+ }
+
+ /**
+ * @dataProvider dataTestEnableTheme
+ *
+ * @param string $toEnable
+ * @param string[] $enabledThemes
+ * @param string[] $expectedEnabled
+ */
+ public function testEnableTheme(string $toEnable, array $enabledThemes, array $expectedEnabled) {
+ $user = $this->createMock(IUser::class);
+ $this->userSession->expects($this->any())
+ ->method('getUser')
+ ->willReturn($user);
+ $user->expects($this->any())
+ ->method('getUID')
+ ->willReturn('user');
+
+ $this->config->expects($this->once())
+ ->method('getUserValue')
+ ->with('user', Application::APP_ID, 'enabled-themes', '[]')
+ ->willReturn(json_encode($enabledThemes));
+
+ $this->assertEquals($expectedEnabled, $this->themesService->enableTheme($this->themes[$toEnable]));
+ }
+
+
+ public function dataTestDisableTheme() {
+ return [
+ ['dark', [], []],
+ ['dark', ['dark'], []],
+ ['opendyslexic', ['dark', 'opendyslexic'], ['dark'], ],
+ ['highcontrast', ['opendyslexic'], ['opendyslexic']],
+ ];
+ }
+
+ /**
+ * @dataProvider dataTestDisableTheme
+ *
+ * @param string $toEnable
+ * @param string[] $enabledThemes
+ * @param string[] $expectedEnabled
+ */
+ public function testDisableTheme(string $toDisable, array $enabledThemes, array $expectedEnabled) {
+ $user = $this->createMock(IUser::class);
+ $this->userSession->expects($this->any())
+ ->method('getUser')
+ ->willReturn($user);
+ $user->expects($this->any())
+ ->method('getUID')
+ ->willReturn('user');
+
+ $this->config->expects($this->once())
+ ->method('getUserValue')
+ ->with('user', Application::APP_ID, 'enabled-themes', '[]')
+ ->willReturn(json_encode($enabledThemes));
+
+
+ $this->assertEquals($expectedEnabled, $this->themesService->disableTheme($this->themes[$toDisable]));
+ }
+
+
+ public function dataTestIsEnabled() {
+ return [
+ ['dark', [], false],
+ ['dark', ['dark'], true],
+ ['opendyslexic', ['dark', 'opendyslexic'], true],
+ ['highcontrast', ['opendyslexic'], false],
+ ];
+ }
+
+ /**
+ * @dataProvider dataTestIsEnabled
+ *
+ * @param string $toEnable
+ * @param string[] $enabledThemes
+ */
+ public function testisEnabled(string $themeId, array $enabledThemes, $expected) {
+ $user = $this->createMock(IUser::class);
+ $this->userSession->expects($this->any())
+ ->method('getUser')
+ ->willReturn($user);
+ $user->expects($this->any())
+ ->method('getUID')
+ ->willReturn('user');
+
+ $this->config->expects($this->once())
+ ->method('getUserValue')
+ ->with('user', Application::APP_ID, 'enabled-themes', '[]')
+ ->willReturn(json_encode($enabledThemes));
+
+
+ $this->assertEquals($expected, $this->themesService->isEnabled($this->themes[$themeId]));
+ }
+
+ private function initThemes() {
+ $util = $this->createMock(Util::class);
+ $urlGenerator = $this->createMock(IURLGenerator::class);
+ $imageManager = $this->createMock(ImageManager::class);
+ $l10n = $this->createMock(IL10N::class);
+
+ $this->themes = [
+ 'default' => new DefaultTheme(
+ $util,
+ $this->themingDefaults,
+ $urlGenerator,
+ $imageManager,
+ $this->config,
+ $l10n,
+ ),
+ 'dark' => new DarkTheme(
+ $util,
+ $this->themingDefaults,
+ $urlGenerator,
+ $imageManager,
+ $this->config,
+ $l10n,
+ ),
+ 'highcontrast' => new HighContrastTheme(
+ $util,
+ $this->themingDefaults,
+ $urlGenerator,
+ $imageManager,
+ $this->config,
+ $l10n,
+ ),
+ 'dark-highcontrast' => new DarkHighContrastTheme(
+ $util,
+ $this->themingDefaults,
+ $urlGenerator,
+ $imageManager,
+ $this->config,
+ $l10n,
+ ),
+ 'opendyslexic' => new DyslexiaFont(
+ $util,
+ $this->themingDefaults,
+ $urlGenerator,
+ $imageManager,
+ $this->config,
+ $l10n,
+ ),
+ ];
+ }
+}
use OCA\Theming\Capabilities;
use OCA\Theming\Controller\ThemingController;
use OCA\Theming\Settings\Admin;
-use OCA\Theming\Settings\Section;
+use OCA\Theming\Settings\PersonalSection;
use OCA\Theming\ThemingDefaults;
use OCA\Theming\Util;
use OCP\AppFramework\App;
// Settings
[Admin::class],
[Admin::class, ISettings::class],
- [Section::class],
- [Section::class, IIconSection::class],
+ [PersonalSection::class],
+ [PersonalSection::class, IIconSection::class],
];
}
*/
namespace OCA\Theming\Tests\Settings;
+use OCA\Theming\AppInfo\Application;
use OCA\Theming\ImageManager;
use OCA\Theming\Settings\Admin;
use OCA\Theming\ThemingDefaults;
$this->imageManager = $this->createMock(ImageManager::class);
$this->admin = new Admin(
+ Application::APP_ID,
$this->config,
$this->l10n,
$this->themingDefaults,
*/
namespace OCA\Theming\Tests\Settings;
-use OCA\Theming\Settings\Section;
+use OCA\Theming\AppInfo\Application;
+use OCA\Theming\Settings\AdminSection;
use OCP\IL10N;
use OCP\IURLGenerator;
use Test\TestCase;
private $url;
/** @var IL10N|\PHPUnit\Framework\MockObject\MockObject */
private $l;
- /** @var Section */
+ /** @var AdminSection */
private $section;
protected function setUp(): void {
$this->url = $this->createMock(IURLGenerator::class);
$this->l = $this->createMock(IL10N::class);
- $this->section = new Section(
+ $this->section = new AdminSection(
+ Application::APP_ID,
$this->url,
$this->l
);
$luminance = $this->util->calculateLuminance('#000');
$this->assertEquals(0, $luminance);
}
+
public function testInvertTextColorInvalid() {
- $invert = $this->util->invertTextColor('aaabbbcccddd123');
- $this->assertEquals(false, $invert);
+ $this->expectException(\Exception::class);
+ $this->util->invertTextColor('aaabbbcccddd123');
}
public function testInvertTextColorEmpty() {
- $invert = $this->util->invertTextColor('');
- $this->assertEquals(false, $invert);
+ $this->expectException(\Exception::class);
+ $this->util->invertTextColor('');
}
public function testElementColorDefault() {
[['comments'], ['admin'], 1, "comments can't be enabled for groups"],
[['updatenotification'], ['admin'], 0, 'updatenotification ([\d\.]*) enabled for groups: admin'],
- [['updatenotification', 'accessibility'], ['admin'], 0, "updatenotification ([\d\.]*) enabled for groups: admin\naccessibility ([\d\.]*) enabled for groups: admin"],
+ [['updatenotification', 'dashboard'], ['admin'], 0, "updatenotification ([\d\.]*) enabled for groups: admin\ndashboard ([\d\.]*) enabled for groups: admin"],
[['updatenotification'], ['admin', 'invalid_group'], 0, 'updatenotification ([\d\.]*) enabled for groups: admin'],
- [['updatenotification', 'accessibility'], ['admin', 'invalid_group'], 0, "updatenotification ([\d\.]*) enabled for groups: admin\naccessibility ([\d\.]*) enabled for groups: admin"],
- [['updatenotification', 'accessibility', 'invalid_app'], ['admin', 'invalid_group'], 1, "updatenotification ([\d\.]*) enabled for groups: admin\naccessibility ([\d\.]*) enabled for groups: admin\nCould not download app invalid_app"],
+ [['updatenotification', 'dashboard'], ['admin', 'invalid_group'], 0, "updatenotification ([\d\.]*) enabled for groups: admin\ndashboard ([\d\.]*) enabled for groups: admin"],
+ [['updatenotification', 'dashboard', 'invalid_app'], ['admin', 'invalid_group'], 1, "updatenotification ([\d\.]*) enabled for groups: admin\ndashboard ([\d\.]*) enabled for groups: admin\nCould not download app invalid_app"],
];
}
}
projects / nextcloud-server.git / commitdiff