Fix tests to always use absolute urls for theming images

Signed-off-by: Julius Härtl <[email protected]>
nextcloud · Mar 28, 2017 · 2b0ac50 · 2b0ac50
1 parent 835e602
commit 2b0ac50
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
@@ -162,7 +162,7 @@ public function getBackground() {
 		if(!$backgroundLogo || $file === null) {
 			return $this->urlGenerator->imagePath('core','background.jpg');
 		} else {
-			return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground');
+			return $this->urlGenerator->linkToRouteAbsolute('theming.Theming.getLoginBackground');
 		}
 	}
 

diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php
@@ -427,7 +427,7 @@ public function testGetBackgroundCustom() {
 			->method('getAppValue')
 			->with('theming', 'backgroundMime')
 			->willReturn('image/svg+xml');
-		$expected = $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground');
+		$expected = $this->urlGenerator->linkToRouteAbsolute('theming.Theming.getLoginBackground');
 		$this->assertEquals($expected, $this->template->getBackground());
 	}
 
@@ -440,7 +440,7 @@ public function testGetLogoDefault() {
 			->method('getAppValue')
 			->with('theming', 'logoMime')
 			->willReturn('');
-		$this->assertEquals('http://localhost/core/img/logo.svg', $this->template->getLogo());
+		$this->assertEquals($this->urlGenerator->getAbsoluteURL('/core/img/logo.svg'), $this->template->getLogo());
 	}
 
 	public function testGetLogoCustom() {
@@ -455,7 +455,7 @@ public function testGetLogoCustom() {
 			->method('getAppValue')
 			->with('theming', 'logoMime')
 			->willReturn('image/svg+xml');
-		$this->assertEquals('http://localhost/index.php/apps/theming/logo', $this->template->getLogo());
+		$this->assertEquals($this->urlGenerator->getAbsoluteURL('index.php/apps/theming/logo'), $this->template->getLogo());
 	}
 
 	public function testGetScssVariablesCached() {
@@ -481,8 +481,8 @@ public function testGetScssVariables() {
 			->willReturn($folder);
 		$expected = [
 			'theming-cachebuster' => '\'0\'',
-			'image-logo' => '\'http://localhost/index.php/apps/theming/logo\'',
-			'image-login-background' => '\'/index.php/apps/theming/loginbackground\'',
+			'image-logo' => '\'' . $this->urlGenerator->getAbsoluteURL('index.php/apps/theming/logo') . '\'',
+			'image-login-background' => '\'' . $this->urlGenerator->getAbsoluteURL('index.php/apps/theming/loginbackground') . '\'',
 			'color-primary' => '#000000',
 			'color-primary-text' => '#ffffff'