Skip to content

Fix unit tests for the theming app #33510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 1 commit into from
Aug 11, 2022
Merged

Fix unit tests for the theming app #33510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions apps/theming/css/default.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
1 change: 0 additions & 1 deletion apps/theming/lib/Themes/DefaultTheme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ public function getCSSVariables(): array {
'--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
Expand Down
2 changes: 1 addition & 1 deletion apps/theming/tests/ImageManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ public function testCleanup() {
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');
Expand Down
19 changes: 18 additions & 1 deletion apps/theming/tests/Themes/DefaultThemeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -68,6 +68,23 @@ protected function setUp(): void {
->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')
Expand Down