summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-12-18 23:38:14 +0100
committerMorris Jobke <hey@morrisjobke.de>2014-12-18 23:38:14 +0100
commit75e8b39826c9278288b8dc02dc19f0ca060080b6 (patch)
treedcb2081b7b8779333d11b3adbf03d6b2c0ea4c76 /apps/files
parent891474b0d6b8cc77a8480cd91f1e48ad3bc3e73b (diff)
parent2eab0f21211762869db74891c2e2611f96bfef15 (diff)
downloadnextcloud-server-75e8b39826c9278288b8dc02dc19f0ca060080b6.tar.gz
nextcloud-server-75e8b39826c9278288b8dc02dc19f0ca060080b6.zip
Merge pull request #12879 from owncloud/mountconfig
Add mount specific options
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/tests/ajax_rename.php2
-rw-r--r--apps/files/tests/helper.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index 48aed05823b..1cfecf9e58c 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -107,7 +107,7 @@ class Test_OC_Files_App_Rename extends \Test\TestCase {
'etag' => 'abcdef',
'directory' => '/',
'name' => 'new_name',
- ))));
+ ), null)));
$result = $this->files->rename($dir, $oldname, $newname);
diff --git a/apps/files/tests/helper.php b/apps/files/tests/helper.php
index 1b7c8eef43a..ea96e41d1d1 100644
--- a/apps/files/tests/helper.php
+++ b/apps/files/tests/helper.php
@@ -24,7 +24,8 @@ class Test_Files_Helper extends \Test\TestCase {
'mtime' => $mtime,
'type' => $isDir ? 'dir' : 'file',
'mimetype' => $isDir ? 'httpd/unix-directory' : 'application/octet-stream'
- )
+ ),
+ null
);
}