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

Fix tests for primary element color 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2017-09-01 23:06:44 +02:00 committed by Morris Jobke
parent 0f2f19c65f
commit ed11c0d6e2
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/theming/css/theming.scss
View File

@ -62,7 +62,7 @@
input.primary {
background-color: $color-primary-element;
border: 1px solid $color-primary-text;
border: 1px solid $color-primary;
color: $color-primary-text;
}

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

@ -507,8 +507,10 @@ class ThemingDefaultsTest extends TestCase {
$this->config->expects($this->at(7))->method('getAppValue')->with('theming', 'color', null)->willReturn($this->defaults->getColorPrimary());
$this->config->expects($this->at(8))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary());
$this->config->expects($this->at(9))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary());
$this->config->expects($this->at(10))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary());
$this->util->expects($this->any())->method('invertTextColor')->with($this->defaults->getColorPrimary())->willReturn(false);
$this->util->expects($this->any())->method('elementColor')->with($this->defaults->getColorPrimary())->willReturn('#aaaaaa');
$this->cache->expects($this->once())->method('get')->with('getScssVariables')->willReturn(null);
$folder = $this->createMock(ISimpleFolder::class);
$file = $this->createMock(ISimpleFile::class);
@ -538,7 +540,8 @@ class ThemingDefaultsTest extends TestCase {
'image-login-background' => "'absolute-custom-background?v=0'",
'color-primary' => $this->defaults->getColorPrimary(),
'color-primary-text' => '#ffffff',
'image-login-plain' => 'false'
'image-login-plain' => 'false',
'color-primary-element' => '#aaaaaa'
];
$this->assertEquals($expected, $this->template->getScssVariables());