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

Fix tests for theming backgroundColor 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2017-05-01 10:42:19 +02:00
parent 4199a56912
commit 510f7cf1b6
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
3 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/theming/lib/Controller/ThemingController.php
View File

@ -185,7 +185,7 @@ class ThemingController extends Controller {
* @return DataResponse
*/
public function updateLogo() {
$backgroundColor = $this->request->getParam('backgroundColor');
$backgroundColor = $this->request->getParam('backgroundColor', false);
if($backgroundColor) {
$this->themingDefaults->set('backgroundMime', 'backgroundColor');
return new DataResponse(

51
apps/theming/tests/Controller/ThemingControllerTest.php
View File

@ -152,11 +152,16 @@ class ThemingControllerTest extends TestCase {
public function testUpdateLogoNoData() {
$this->request
->expects($this->at(0))
->method('getParam')
->with('backgroundColor')
->willReturn(false);
$this->request
->expects($this->at(1))
->method('getUploadedFile')
->with('uploadlogo')
->willReturn(null);
$this->request
->expects($this->at(1))
->expects($this->at(2))
->method('getUploadedFile')
->with('upload-login-background')
->willReturn(null);
@ -179,6 +184,29 @@ class ThemingControllerTest extends TestCase {
$this->assertEquals($expected, $this->themingController->updateLogo());
}
public function testUpdateBackgroundColor() {
$this->request
->expects($this->at(0))
->method('getParam')
->with('backgroundColor')
->willReturn(true);
$this->themingDefaults
->expects($this->once())
->method('set')
->with('backgroundMime', 'backgroundColor');
$expected = new DataResponse(
[
'data' =>
[
'name' => 'backgroundColor',
'message' => $this->l10n->t('Saved')
],
'status' => 'success'
]
);
$this->assertEquals($expected, $this->themingController->updateLogo());
}
public function dataUpdateImages() {
return [
[false],
@ -194,6 +222,11 @@ class ThemingControllerTest extends TestCase {
touch($tmpLogo);
$this->request
->expects($this->at(0))
->method('getParam')
->with('backgroundColor')
->willReturn(false);
$this->request
->expects($this->at(1))
->method('getUploadedFile')
->with('uploadlogo')
->willReturn([
@ -202,7 +235,7 @@ class ThemingControllerTest extends TestCase {
'name' => 'logo.svg',
]);
$this->request
->expects($this->at(1))
->expects($this->at(2))
->method('getUploadedFile')
->with('upload-login-background')
->willReturn(null);
@ -259,11 +292,16 @@ class ThemingControllerTest extends TestCase {
file_put_contents($tmpLogo, file_get_contents(__DIR__ . '/../../../../tests/data/desktopapp.png'));
$this->request
->expects($this->at(0))
->method('getParam')
->with('backgroundColor')
->willReturn(false);
$this->request
->expects($this->at(1))
->method('getUploadedFile')
->with('uploadlogo')
->willReturn(null);
$this->request
->expects($this->at(1))
->expects($this->at(2))
->method('getUploadedFile')
->with('upload-login-background')
->willReturn([
@ -322,11 +360,16 @@ class ThemingControllerTest extends TestCase {
file_put_contents($tmpLogo, file_get_contents(__DIR__ . '/../../../../tests/data/data.zip'));
$this->request
->expects($this->at(0))
->method('getParam')
->with('backgroundColor')
->willReturn(false);
$this->request
->expects($this->at(1))
->method('getUploadedFile')
->with('uploadlogo')
->willReturn(null);
$this->request
->expects($this->at(1))
->expects($this->at(2))
->method('getUploadedFile')
->with('upload-login-background')
->willReturn([

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

@ -525,7 +525,8 @@ class ThemingDefaultsTest extends TestCase {
'image-logo' => "'absolute-custom-logo?v=0'",
'image-login-background' => "'absolute-custom-background?v=0'",
'color-primary' => $this->defaults->getColorPrimary(),
'color-primary-text' => '#ffffff'
'color-primary-text' => '#ffffff',
'image-login-plain' => 'false'
];
$this->assertEquals($expected, $this->template->getScssVariables());