diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-05-20 14:44:01 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-05-20 14:44:01 +0200 |
| commit | 39d1e99228a22e232795b9800503697b866f5023 (patch) | |
| tree | 01e67900bdec53eec9a6cc2ac201a35accd015da /apps/files_trashbin/tests | |
| parent | 1a67e5cdc3242433225b6b8c08b7664f47c78255 (diff) | |
| parent | 2213d6597c5d052acc27e294227a10d23ba00448 (diff) | |
| download | nextcloud-server-39d1e99228a22e232795b9800503697b866f5023.tar.gz nextcloud-server-39d1e99228a22e232795b9800503697b866f5023.zip | |
Merge pull request #16322 from owncloud/trash-view
dont go trough the view when moving to trash
Diffstat (limited to 'apps/files_trashbin/tests')
| -rw-r--r-- | apps/files_trashbin/tests/storage.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/files_trashbin/tests/storage.php b/apps/files_trashbin/tests/storage.php index d8ddf74e24a..f99bc91dd26 100644 --- a/apps/files_trashbin/tests/storage.php +++ b/apps/files_trashbin/tests/storage.php @@ -316,10 +316,16 @@ class Storage extends \Test\TestCase { */ $storage = $this->getMockBuilder('\OC\Files\Storage\Temporary') ->setConstructorArgs([[]]) - ->setMethods(['rename', 'unlink']) + ->setMethods(['rename', 'unlink', 'moveFromStorage']) ->getMock(); $storage->expects($this->any()) + ->method('rename') + ->will($this->returnValue(false)); + $storage->expects($this->any()) + ->method('moveFromStorage') + ->will($this->returnValue(false)); + $storage->expects($this->any()) ->method('unlink') ->will($this->returnValue(false)); |