summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2015-07-14 08:43:14 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2015-07-27 14:59:45 +0200
commit141a0f0f476a6675c0db9044afc7447342197f45 (patch)
tree49ed19f1c729707f6fe9f2789d6c5cd048866dbb /tests
parent6db6689740a5d11dd53b2502d1eea6e9157479df (diff)
downloadnextcloud-server-141a0f0f476a6675c0db9044afc7447342197f45.tar.gz
nextcloud-server-141a0f0f476a6675c0db9044afc7447342197f45.zip
Move mimetypedetection to files/type/detection
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/files/type/detection.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/lib/files/type/detection.php b/tests/lib/files/type/detection.php
index 1483839bf7f..ce4c437c9dc 100644
--- a/tests/lib/files/type/detection.php
+++ b/tests/lib/files/type/detection.php
@@ -26,7 +26,7 @@ use \OC\Files\Type\Detection;
class DetectionTest extends \Test\TestCase {
public function testDetect() {
- $detection = new Detection();
+ $detection = new Detection(\OC::$server->getURLGenerator());
$dir = \OC::$SERVERROOT.'/tests/data';
$result = $detection->detect($dir."/");
@@ -51,7 +51,7 @@ class DetectionTest extends \Test\TestCase {
}
public function testGetSecureMimeType() {
- $detection = new Detection();
+ $detection = new Detection(\OC::$server->getURLGenerator());
$dist = file_get_contents(\OC::$configDir . '/mimetypemapping.dist.json');
$mimetypemapping = get_object_vars(json_decode($dist));
$detection->registerTypeArray($mimetypemapping);
@@ -66,7 +66,7 @@ class DetectionTest extends \Test\TestCase {
}
public function testDetectPath() {
- $detection = new Detection();
+ $detection = new Detection(\OC::$server->getURLGenerator());
$dist = file_get_contents(\OC::$configDir . '/mimetypemapping.dist.json');
$mimetypemapping = get_object_vars(json_decode($dist));
$detection->registerTypeArray($mimetypemapping);
@@ -84,7 +84,7 @@ class DetectionTest extends \Test\TestCase {
$this->markTestSkipped('[Windows] Strings have mimetype application/octet-stream on Windows');
}
- $detection = new Detection();
+ $detection = new Detection(\OC::$server->getURLGenerator());
$dist = file_get_contents(\OC::$configDir . '/mimetypemapping.dist.json');
$mimetypemapping = get_object_vars(json_decode($dist));
$detection->registerTypeArray($mimetypemapping);