From ecc9b42e4143773e4a850d6ee385328b16cda813 Mon Sep 17 00:00:00 2001 From: kondou Date: Thu, 4 Sep 2014 19:51:38 +0200 Subject: Match \OC_Helper::linkToPublic() to new links and fit unittests --- tests/lib/helper.php | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/lib/helper.php b/tests/lib/helper.php index 20b8571b91d..cb342e295ba 100644 --- a/tests/lib/helper.php +++ b/tests/lib/helper.php @@ -443,15 +443,33 @@ class Test_Helper extends PHPUnit_Framework_TestCase { public function testLinkToPublic() { \OC::$WEBROOT = ''; $result = \OC_Helper::linkToPublic('files'); - $this->assertEquals('http://localhost/public.php?service=files', $result); + $this->assertEquals('http://localhost/s', $result); $result = \OC_Helper::linkToPublic('files', false); - $this->assertEquals('http://localhost/public.php?service=files', $result); + $this->assertEquals('http://localhost/s', $result); + $result = \OC_Helper::linkToPublic('files', true); + $this->assertEquals('http://localhost/s/', $result); + + $result = \OC_Helper::linkToPublic('other'); + $this->assertEquals('http://localhost/public.php?service=other', $result); + $result = \OC_Helper::linkToPublic('other', false); + $this->assertEquals('http://localhost/public.php?service=other', $result); + $result = \OC_Helper::linkToPublic('other', true); + $this->assertEquals('http://localhost/public.php?service=other/', $result); \OC::$WEBROOT = '/owncloud'; $result = \OC_Helper::linkToPublic('files'); - $this->assertEquals('http://localhost/owncloud/public.php?service=files', $result); + $this->assertEquals('http://localhost/owncloud/s', $result); $result = \OC_Helper::linkToPublic('files', false); - $this->assertEquals('http://localhost/owncloud/public.php?service=files', $result); + $this->assertEquals('http://localhost/owncloud/s', $result); + $result = \OC_Helper::linkToPublic('files', true); + $this->assertEquals('http://localhost/owncloud/s/', $result); + + $result = \OC_Helper::linkToPublic('other'); + $this->assertEquals('http://localhost/owncloud/public.php?service=other', $result); + $result = \OC_Helper::linkToPublic('other', false); + $this->assertEquals('http://localhost/owncloud/public.php?service=other', $result); + $result = \OC_Helper::linkToPublic('other', true); + $this->assertEquals('http://localhost/owncloud/public.php?service=other/', $result); } /** -- cgit v1.2.3