mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Match \OC_Helper::linkToPublic() to new links and fit unittests

This commit is contained in:
kondou 2014-09-04 19:51:38 +02:00
parent a10411d2bc
commit ecc9b42e41
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/private/helper.php
View File

@ -129,12 +129,12 @@ class OC_Helper {
* Returns a absolute url to the given service.
*/
public static function linkToPublic($service, $add_slash = false) {
return OC::$server->getURLGenerator()->getAbsoluteURL(
self::linkTo(
'', 'public.php') . '?service=' . $service
. (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : ''
)
);
if ($service === 'files') {
$url = OC::$server->getURLGenerator()->getAbsoluteURL('/s');
} else {
$url = OC::$server->getURLGenerator()->getAbsoluteURL(self::linkTo('', 'public.php').'?service='.$service);
}
return $url . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : '');
}
/**

26
tests/lib/helper.php
View File

@ -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);
}
/**