mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix theming tests 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2017-04-24 10:50:24 +02:00 committed by Joas Schilling
parent 1c54463853
commit bc1efdf2e1
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
2 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/theming/lib/ThemingDefaults.php
View File

@ -169,7 +169,7 @@ class ThemingDefaults extends \OC_Defaults {
return $this->urlGenerator->imagePath('core','background.jpg'); return $this->urlGenerator->imagePath('core','background.jpg');
} }
return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground'); return $this->urlGenerator->linkToRouteAbsolute('theming.Theming.getLoginBackground');
} }

41
apps/theming/tests/ThemingDefaultsTest.php
View File

@ -421,26 +421,17 @@ class ThemingDefaultsTest extends TestCase {
public function testGetBackgroundCustom() { public function testGetBackgroundCustom() {
$folder = $this->createMock(ISimpleFolder::class); $folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class); $file = $this->createMock(ISimpleFile::class);
$folder->expects($this->once())->method('getFile')->willReturn($file); $folder->expects($this->once())
->method('getFile')
->willReturn($file);
$this->appData->expects($this->once()) $this->appData->expects($this->once())
->method('getFolder') ->method('getFolder')
->willReturn($folder); ->willReturn($folder);
$this->config $this->config
->expects($this->once()) ->expects($this->once())
->method('getAppValue') ->method('getAppValue')
->with('theming', 'backgroundMime') ->with('theming', 'backgroundMime', false)
->willReturn('image/svg+xml'); ->willReturn('image/svg+xml');
$simpleFolder = $this->createMock(ISimpleFolder::class);
$this->appData
->expects($this->once())
->method('getFolder')
->with('images')
->willReturn($simpleFolder);
$simpleFolder
->expects($this->once())
->method('getFile')
->with('background')
->willReturn('');
$expected = $this->urlGenerator->linkToRouteAbsolute('theming.Theming.getLoginBackground'); $expected = $this->urlGenerator->linkToRouteAbsolute('theming.Theming.getLoginBackground');
$this->assertEquals($expected, $this->template->getBackground()); $this->assertEquals($expected, $this->template->getBackground());
} }
@ -471,31 +462,22 @@ class ThemingDefaultsTest extends TestCase {
public function testGetLogoCustom() { public function testGetLogoCustom() {
$folder = $this->createMock(ISimpleFolder::class); $folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class); $file = $this->createMock(ISimpleFile::class);
$folder->expects($this->once())->method('getFile')->willReturn($file); $folder->expects($this->once())
->method('getFile')
->willReturn($file);
$this->appData->expects($this->once()) $this->appData->expects($this->once())
->method('getFolder') ->method('getFolder')
->willReturn($folder); ->willReturn($folder);
$this->config $this->config
->expects($this->at(0)) ->expects($this->at(0))
->method('getAppValue') ->method('getAppValue')
->with('theming', 'logoMime') ->with('theming', 'logoMime', false)
->willReturn('image/svg+xml'); ->willReturn('image/svg+xml');
$this->config $this->config
->expects($this->at(1)) ->expects($this->at(1))
->method('getAppValue') ->method('getAppValue')
->with('theming', 'cachebuster', '0') ->with('theming', 'cachebuster', '0')
->willReturn('0'); ->willReturn('0');
$simpleFolder = $this->createMock(ISimpleFolder::class);
$this->appData
->expects($this->once())
->method('getFolder')
->with('images')
->willReturn($simpleFolder);
$simpleFolder
->expects($this->once())
->method('getFile')
->with('logo')
->willReturn('');
$expected = $this->urlGenerator->getAbsoluteURL('index.php/apps/theming/logo') . '?v=0'; $expected = $this->urlGenerator->getAbsoluteURL('index.php/apps/theming/logo') . '?v=0';
$this->assertEquals($expected, $this->template->getLogo()); $this->assertEquals($expected, $this->template->getLogo());
} }
@ -508,10 +490,11 @@ class ThemingDefaultsTest extends TestCase {
public function testGetScssVariables() { public function testGetScssVariables() {
$this->config->expects($this->at(0))->method('getAppValue')->with('theming', 'cachebuster', '0')->willReturn('0'); $this->config->expects($this->at(0))->method('getAppValue')->with('theming', 'cachebuster', '0')->willReturn('0');
$this->config->expects($this->at(1))->method('getAppValue')->with('theming', 'logoMime', false)->willReturn('jpeg'); $this->config->expects($this->at(1))->method('getAppValue')->with('theming', 'logoMime', false)->willReturn('jpeg');
$this->config->expects($this->at(2))->method('getAppValue')->with('theming', 'backgroundMime', false)->willReturn('jpeg'); $this->config->expects($this->at(2))->method('getAppValue')->with('theming', 'cachebuster', '0')->willReturn('0');
$this->config->expects($this->at(3))->method('getAppValue')->with('theming', 'color', null)->willReturn('#000000'); $this->config->expects($this->at(3))->method('getAppValue')->with('theming', 'backgroundMime', false)->willReturn('jpeg');
$this->config->expects($this->at(4))->method('getAppValue')->with('theming', 'color', '#000')->willReturn('#000000'); $this->config->expects($this->at(4))->method('getAppValue')->with('theming', 'color', null)->willReturn('#000000');
$this->config->expects($this->at(5))->method('getAppValue')->with('theming', 'color', '#000')->willReturn('#000000'); $this->config->expects($this->at(5))->method('getAppValue')->with('theming', 'color', '#000')->willReturn('#000000');
$this->config->expects($this->at(6))->method('getAppValue')->with('theming', 'color', '#000')->willReturn('#000000');
$this->util->expects($this->any())->method('invertTextColor')->with('#000000')->willReturn(false); $this->util->expects($this->any())->method('invertTextColor')->with('#000000')->willReturn(false);
$this->cache->expects($this->once())->method('get')->with('getScssVariables')->willReturn(null); $this->cache->expects($this->once())->method('get')->with('getScssVariables')->willReturn(null);