diff options
author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2017-03-28 01:37:47 +0200 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-03-29 18:23:23 +0200 |
commit | 9a75714c22b406ef13c985bec567b9d88ce7dc84 (patch) | |
tree | 7e95558e53586f52f5da70d4f514d857bc3733c2 /apps/theming/tests | |
parent | 626d03e3d47994364500bd6cd5dd9a029b862fb7 (diff) | |
download | nextcloud-server-9a75714c22b406ef13c985bec567b9d88ce7dc84.tar.gz nextcloud-server-9a75714c22b406ef13c985bec567b9d88ce7dc84.zip |
rename confusing getMailHeaderColor to getColorPrimary, ref #3491
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Diffstat (limited to 'apps/theming/tests')
-rw-r--r-- | apps/theming/tests/CapabilitiesTest.php | 2 | ||||
-rw-r--r-- | apps/theming/tests/Controller/ThemingControllerTest.php | 4 | ||||
-rw-r--r-- | apps/theming/tests/IconBuilderTest.php | 6 | ||||
-rw-r--r-- | apps/theming/tests/Settings/AdminTest.php | 4 | ||||
-rw-r--r-- | apps/theming/tests/ThemingDefaultsTest.php | 10 |
5 files changed, 13 insertions, 13 deletions
diff --git a/apps/theming/tests/CapabilitiesTest.php b/apps/theming/tests/CapabilitiesTest.php index 218fca505ed..1c379797736 100644 --- a/apps/theming/tests/CapabilitiesTest.php +++ b/apps/theming/tests/CapabilitiesTest.php @@ -106,7 +106,7 @@ class CapabilitiesTest extends TestCase { ->method('getSlogan') ->willReturn($slogan); $this->theming->expects($this->once()) - ->method('getMailHeaderColor') + ->method('getColorPrimary') ->willReturn($color); $this->theming->expects($this->once()) ->method('getLogo') diff --git a/apps/theming/tests/Controller/ThemingControllerTest.php b/apps/theming/tests/Controller/ThemingControllerTest.php index 3afcdb847b6..cc7f73f742f 100644 --- a/apps/theming/tests/Controller/ThemingControllerTest.php +++ b/apps/theming/tests/Controller/ThemingControllerTest.php @@ -983,7 +983,7 @@ class ThemingControllerTest extends TestCase { ->willReturn(""); $this->template ->expects($this->at(3)) - ->method('getMailHeaderColor') + ->method('getColorPrimary') ->willReturn("#000"); @@ -1018,7 +1018,7 @@ class ThemingControllerTest extends TestCase { ->willReturn("awesome"); $this->template ->expects($this->any()) - ->method('getMailHeaderColor') + ->method('getColorPrimary') ->willReturn("#ffffff"); $expectedResponse = '(function() { diff --git a/apps/theming/tests/IconBuilderTest.php b/apps/theming/tests/IconBuilderTest.php index da27795ce2c..423e3e86dbc 100644 --- a/apps/theming/tests/IconBuilderTest.php +++ b/apps/theming/tests/IconBuilderTest.php @@ -87,7 +87,7 @@ class IconBuilderTest extends TestCase { public function testRenderAppIcon($app, $color, $file) { $this->checkImagick(); $this->themingDefaults->expects($this->once()) - ->method('getMailHeaderColor') + ->method('getColorPrimary') ->willReturn($color); $expectedIcon = new \Imagick(realpath(dirname(__FILE__)). "/data/" . $file); @@ -112,7 +112,7 @@ class IconBuilderTest extends TestCase { public function testGetTouchIcon($app, $color, $file) { $this->checkImagick(); $this->themingDefaults->expects($this->once()) - ->method('getMailHeaderColor') + ->method('getColorPrimary') ->willReturn($color); $expectedIcon = new \Imagick(realpath(dirname(__FILE__)). "/data/" . $file); @@ -138,7 +138,7 @@ class IconBuilderTest extends TestCase { public function testGetFavicon($app, $color, $file) { $this->checkImagick(); $this->themingDefaults->expects($this->once()) - ->method('getMailHeaderColor') + ->method('getColorPrimary') ->willReturn($color); $expectedIcon = new \Imagick(realpath(dirname(__FILE__)). "/data/" . $file); diff --git a/apps/theming/tests/Settings/AdminTest.php b/apps/theming/tests/Settings/AdminTest.php index d4f5490d352..70939677582 100644 --- a/apps/theming/tests/Settings/AdminTest.php +++ b/apps/theming/tests/Settings/AdminTest.php @@ -78,7 +78,7 @@ class AdminTest extends TestCase { ->willReturn('MySlogan'); $this->themingDefaults ->expects($this->once()) - ->method('getMailHeaderColor') + ->method('getColorPrimary') ->willReturn('#fff'); $this->urlGenerator ->expects($this->once()) @@ -128,7 +128,7 @@ class AdminTest extends TestCase { ->willReturn('MySlogan'); $this->themingDefaults ->expects($this->once()) - ->method('getMailHeaderColor') + ->method('getColorPrimary') ->willReturn('#fff'); $this->urlGenerator ->expects($this->once()) diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php index cd3a90e760a..72ccaa57d77 100644 --- a/apps/theming/tests/ThemingDefaultsTest.php +++ b/apps/theming/tests/ThemingDefaultsTest.php @@ -73,7 +73,7 @@ class ThemingDefaultsTest extends TestCase { ->willReturn('Safe Data'); $this->defaults ->expects($this->at(3)) - ->method('getMailHeaderColor') + ->method('getColorPrimary') ->willReturn('#000'); $this->template = new ThemingDefaults( $this->config, @@ -232,24 +232,24 @@ class ThemingDefaultsTest extends TestCase { $this->assertEquals('<a href="url" target="_blank" rel="noreferrer">Name</a>', $this->template->getShortFooter()); } - public function testGetMailHeaderColorWithDefault() { + public function testgetColorPrimaryWithDefault() { $this->config ->expects($this->once()) ->method('getAppValue') ->with('theming', 'color', '#000') ->willReturn('#000'); - $this->assertEquals('#000', $this->template->getMailHeaderColor()); + $this->assertEquals('#000', $this->template->getColorPrimary()); } - public function testGetMailHeaderColorWithCustom() { + public function testgetColorPrimaryWithCustom() { $this->config ->expects($this->once()) ->method('getAppValue') ->with('theming', 'color', '#000') ->willReturn('#fff'); - $this->assertEquals('#fff', $this->template->getMailHeaderColor()); + $this->assertEquals('#fff', $this->template->getColorPrimary()); } public function testSet() { |