summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2015-02-09 15:15:03 +0100
committerRobin Appelman <icewind@owncloud.com>2015-04-13 15:13:03 +0200
commitd26c6cab90b15bcf9cbd0d95015d8ad2405f7914 (patch)
tree34c7a684431c8e9d21d67e7754ce145e445d537e /apps
parentc4ec8fbeff926e459317829695af1354b4c8ad61 (diff)
downloadnextcloud-server-d26c6cab90b15bcf9cbd0d95015d8ad2405f7914.tar.gz
nextcloud-server-d26c6cab90b15bcf9cbd0d95015d8ad2405f7914.zip
properly return false if we cant delete the source file
Diffstat (limited to 'apps')
-rw-r--r--apps/files_trashbin/tests/storage.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/files_trashbin/tests/storage.php b/apps/files_trashbin/tests/storage.php
index d5bd7c318d3..d1468522dc2 100644
--- a/apps/files_trashbin/tests/storage.php
+++ b/apps/files_trashbin/tests/storage.php
@@ -202,12 +202,13 @@ class Storage extends \Test\TestCase {
$cache = $storage->getCache();
- Filesystem::mount($storage, [], '/' . $this->user . '/files');
+ Filesystem::mount($storage, [], '/' . $this->user);
+ $storage->mkdir('files');
$this->userView->file_put_contents('test.txt', 'foo');
- $this->assertTrue($storage->file_exists('test.txt'));
+ $this->assertTrue($storage->file_exists('files/test.txt'));
$this->assertFalse($this->userView->unlink('test.txt'));
- $this->assertTrue($storage->file_exists('test.txt'));
- $this->assertTrue($cache->inCache('test.txt'));
+ $this->assertTrue($storage->file_exists('files/test.txt'));
+ $this->assertTrue($cache->inCache('files/test.txt'));
// file should not be in the trashbin
$results = $this->rootView->getDirectoryContent($this->user . '/files_trashbin/files/');