summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2013-05-07 07:52:57 -0700
committerMichael Gapczynski <mtgap@owncloud.com>2013-05-07 07:52:57 -0700
commit349a533f667bdac2325a797dcee6007117063039 (patch)
tree479f050e43f9758b004694b56db94234a3f1e841 /tests
parent398fbb61f8d4f579da3891c4516d5fb71759246a (diff)
parent10be42f5b7b17ca55c242960885a9b50e217af3f (diff)
downloadnextcloud-server-349a533f667bdac2325a797dcee6007117063039.tar.gz
nextcloud-server-349a533f667bdac2325a797dcee6007117063039.zip
Merge pull request #3025 from owncloud/move-file
Cache: only look for child entires when doing a move operation when moving a folder
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/files/cache/cache.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php
index 250842805e5..4051a6e234b 100644
--- a/tests/lib/files/cache/cache.php
+++ b/tests/lib/files/cache/cache.php
@@ -162,10 +162,11 @@ class Cache extends \PHPUnit_Framework_TestCase {
$file4 = 'folder/foo/1';
$file5 = 'folder/foo/2';
$data = array('size' => 100, 'mtime' => 50, 'mimetype' => 'foo/bar');
+ $folderData = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory');
- $this->cache->put($file1, $data);
- $this->cache->put($file2, $data);
- $this->cache->put($file3, $data);
+ $this->cache->put($file1, $folderData);
+ $this->cache->put($file2, $folderData);
+ $this->cache->put($file3, $folderData);
$this->cache->put($file4, $data);
$this->cache->put($file5, $data);