sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed tests 

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
pull/7688/head
John Molakvoæ (skjnldsv) 2017-12-28 14:19:13 +07:00
parent 9fa49c7f24
commit 1ae126a781
No known key found for this signature in database
GPG Key ID: FB5ACEED51955BF8
4 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Template/SCSSCacher.php
Unescape Escape View File

@ -319,7 +319,7 @@ class SCSSCacher {
*/
private function getWebDir($path, $appName, $serverRoot, $webRoot) {
// Detect if path is within server root AND if path is within an app path
if ( !strpos($path, $serverRoot) && $appWebPath = \OC_App::getAppWebPath($appName) ) {
if ( strpos($path, $serverRoot) === false && $appWebPath = \OC_App::getAppWebPath($appName)) {
// Get the file path within the app directory
$appDirectoryPath = explode($appName, $path)[1];
// Remove the webroot

11
tests/lib/LegacyHelperTest.php
Unescape Escape View File

@ -12,6 +12,17 @@ use OC\Files\View;
use OC_Helper;
class LegacyHelperTest extends \Test\TestCase {
/** @var string */
private $originalWebRoot;
public function setUp() {
$this->originalWebRoot = \OC::$WEBROOT;
}
public function tearDown() {
// Reset webRoot
\OC::$WEBROOT = $this->originalWebRoot;
}
/**
* @dataProvider humanFileSizeProvider

24
tests/lib/Template/SCSSCacherTest.php
Unescape Escape View File

@ -384,17 +384,6 @@ class SCSSCacherTest extends \Test\TestCase {
$this->assertEquals(substr($result, 1), $actual);
}
public function dataGetWebDir() {
return [
['/http/core/css', 'core', '', '/http', '/core/css'],
['/http/apps/test/css', 'test', '', '/http', '/apps/test/css'],
['/http/nextcloud/core/css', 'core', '/nextcloud', '/http/nextcloud', '/nextcloud/core/css'],
['/http/nextcloud/apps/test/css', 'test', '/nextcloud', '/http/nextcloud', '/nextcloud/apps/test/css'],
['/srv/apps2/test/css', 'test', '', '/http', '/apps2/test/css'],
['/srv/apps2/test/css', 'test', '/nextcloud', '/http/nextcloud', '/apps2/test/css']
];
}
private function randomString() {
return sha1(uniqid(mt_rand(), true));
}
@ -411,6 +400,19 @@ class SCSSCacherTest extends \Test\TestCase {
return rmdir($directory);
}
public function dataGetWebDir() {
return [
// Root installation
['/http/core/css', 'core', '', '/http', '/core/css'],
['/http/apps/scss/css', 'scss', '', '/http', '/apps/scss/css'],
['/srv/apps2/scss/css', 'scss', '', '/http', '/apps2/scss/css'],
// Sub directory install
['/http/nextcloud/core/css', 'core', '/nextcloud', '/http/nextcloud', '/nextcloud/core/css'],
['/http/nextcloud/apps/scss/css', 'scss', '/nextcloud', '/http/nextcloud', '/nextcloud/apps/scss/css'],
['/srv/apps2/scss/css', 'scss', '/nextcloud', '/http/nextcloud', '/apps2/scss/css']
];
}
/**
* @param $path
* @param $appName

10
tests/lib/UrlGeneratorTest.php
Unescape Escape View File

@ -27,6 +27,8 @@ class UrlGeneratorTest extends \Test\TestCase {
private $request;
/** @var IURLGenerator */
private $urlGenerator;
/** @var string */
private $originalWebRoot;
public function setUp() {
parent::setUp();
@ -38,6 +40,12 @@ class UrlGeneratorTest extends \Test\TestCase {
$this->cacheFactory,
$this->request
);
$this->originalWebRoot = \OC::$WEBROOT;
}
public function tearDown() {
// Reset webRoot
\OC::$WEBROOT = $this->originalWebRoot;
}
private function mockBaseUrl() {
@ -47,7 +55,6 @@ class UrlGeneratorTest extends \Test\TestCase {
$this->request->expects($this->once())
->method('getServerHost')
->willReturn('localhost');
}
/**
@ -156,4 +163,3 @@ class UrlGeneratorTest extends \Test\TestCase {
}
}