From 04e5c11ed90a7facc9f4669b34d0c78b8deab3c4 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Wed, 30 Jul 2014 23:22:37 +0100 Subject: [PATCH] TEST Empty absolute urls - tests for #3323 --- tests/control/DirectorTest.php | 4 ++++ tests/control/HTTPTest.php | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/tests/control/DirectorTest.php b/tests/control/DirectorTest.php index 1e4d0e0c9..e89d9f3c6 100644 --- a/tests/control/DirectorTest.php +++ b/tests/control/DirectorTest.php @@ -96,6 +96,9 @@ class DirectorTest extends SapphireTest { $rootURL = Director::protocolAndHost(); $_SERVER['REQUEST_URI'] = "$rootURL/mysite/sub-page/"; Config::inst()->update('Director', 'alternate_base_url', '/mysite/'); + + //test empty URL + $this->assertEquals($rootURL, Director::absoluteURL('')); // Test already absolute url $this->assertEquals($rootURL, Director::absoluteURL($rootURL)); @@ -137,6 +140,7 @@ class DirectorTest extends SapphireTest { Config::inst()->update('Director', 'alternate_base_url', 'http://www.example.org/'); $this->assertEquals('http://www.example.org/', Director::baseURL()); $this->assertEquals('http://www.example.org/', Director::absoluteBaseURL()); + $this->assertEquals('http://www.example.org/', Director::absoluteURL('')); $this->assertEquals('http://www.example.org/subfolder/test', Director::absoluteURL('subfolder/test')); // Setting it to false restores functionality diff --git a/tests/control/HTTPTest.php b/tests/control/HTTPTest.php index 2d6a08e34..a9b637210 100644 --- a/tests/control/HTTPTest.php +++ b/tests/control/HTTPTest.php @@ -161,6 +161,12 @@ class HTTPTest extends SapphireTest { public function testAbsoluteURLsAttributes() { $this->withBaseURL('http://www.silverstripe.org/', function($test){ + //empty links + $test->assertEquals( + 'test', + HTTP::absoluteURLs('test') + ); + // links $test->assertEquals( 'SS Blog',