diff options
author | Julius Härtl <jus@bitgrid.net> | 2018-08-27 16:22:49 +0300 |
---|---|---|
committer | Julius Härtl <jus@bitgrid.net> | 2018-08-27 16:22:49 +0300 |
commit | c4f34ccc4cf3823a0ccfdbad2d20ba20c474ecce (patch) | |
tree | b2e788d88ad20a351602bfe1b757f0a4bdc3e823 /apps | |
parent | 5175e33e31a45035ad4162aef3c342a277a26894 (diff) |
Theming: Fix footer tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps')
-rw-r--r-- | apps/theming/lib/ThemingDefaults.php | 5 | ||||
-rw-r--r-- | apps/theming/tests/ThemingDefaultsTest.php | 29 |
2 files changed, 25 insertions, 9 deletions
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php index 3c7acafd6e9..fe1b1d4c17f 100644 --- a/apps/theming/lib/ThemingDefaults.php +++ b/apps/theming/lib/ThemingDefaults.php @@ -151,8 +151,9 @@ class ThemingDefaults extends \OC_Defaults { public function getShortFooter() { $slogan = $this->getSlogan(); - if ($this->getBaseUrl() !== '') { - $footer = '<a href="' . $this->getBaseUrl() . '" target="_blank"' . + $baseUrl = $this->getBaseUrl(); + if ($baseUrl !== '') { + $footer = '<a href="' . $baseUrl . '" target="_blank"' . ' rel="noreferrer noopener" class="entity-name">' . $this->getEntity() . '</a>'; } else { $footer = '<span class="entity-name">' .$this->getEntity() . '</span>'; diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php index 87b2003ded2..5d075709dc5 100644 --- a/apps/theming/tests/ThemingDefaultsTest.php +++ b/apps/theming/tests/ThemingDefaultsTest.php @@ -262,7 +262,22 @@ class ThemingDefaultsTest extends TestCase { ['theming', 'privacyUrl', '', ''], ]); - $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener">Name</a> – Slogan', $this->template->getShortFooter()); + $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter()); + } + + public function testGetShortFooterEmptyUrl() { + $this->config + ->expects($this->exactly(5)) + ->method('getAppValue') + ->willReturnMap([ + ['theming', 'url', $this->defaults->getBaseUrl(), ''], + ['theming', 'name', 'Nextcloud', 'Name'], + ['theming', 'slogan', $this->defaults->getSlogan(), 'Slogan'], + ['theming', 'imprintUrl', '', ''], + ['theming', 'privacyUrl', '', ''], + ]); + + $this->assertEquals('<span class="entity-name">Name</span> – Slogan', $this->template->getShortFooter()); } public function testGetShortFooterEmptySlogan() { @@ -277,7 +292,7 @@ class ThemingDefaultsTest extends TestCase { ['theming', 'privacyUrl', '', ''], ]); - $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener">Name</a>', $this->template->getShortFooter()); + $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a>', $this->template->getShortFooter()); } public function testGetShortFooterImprint() { @@ -297,7 +312,7 @@ class ThemingDefaultsTest extends TestCase { ->method('t') ->willReturnArgument(0); - $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener">Name</a> – Slogan<br/><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a>', $this->template->getShortFooter()); + $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a>', $this->template->getShortFooter()); } public function testGetShortFooterPrivacy() { @@ -317,7 +332,7 @@ class ThemingDefaultsTest extends TestCase { ->method('t') ->willReturnArgument(0); - $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener">Name</a> – Slogan<br/><a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a>', $this->template->getShortFooter()); + $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a>', $this->template->getShortFooter()); } public function testGetShortFooterAllLegalLinks() { @@ -337,7 +352,7 @@ class ThemingDefaultsTest extends TestCase { ->method('t') ->willReturnArgument(0); - $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener">Name</a> – Slogan<br/><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a> · <a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a>', $this->template->getShortFooter()); + $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan<br/><a href="https://example.com/imprint" class="legal" target="_blank" rel="noreferrer noopener">Legal notice</a> · <a href="https://example.com/privacy" class="legal" target="_blank" rel="noreferrer noopener">Privacy policy</a>', $this->template->getShortFooter()); } public function invalidLegalUrlProvider() { @@ -363,7 +378,7 @@ class ThemingDefaultsTest extends TestCase { ['theming', 'privacyUrl', '', ''], ]); - $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener">Name</a> – Slogan', $this->template->getShortFooter()); + $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter()); } /** @@ -382,7 +397,7 @@ class ThemingDefaultsTest extends TestCase { ['theming', 'privacyUrl', '', $invalidPrivacyUrl], ]); - $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener">Name</a> – Slogan', $this->template->getShortFooter()); + $this->assertEquals('<a href="url" target="_blank" rel="noreferrer noopener" class="entity-name">Name</a> – Slogan', $this->template->getShortFooter()); } public function testgetColorPrimaryWithDefault() { |