summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin/tests
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2019-08-05 19:10:49 +0200
committerJulius Härtl <jus@bitgrid.net>2019-08-06 17:45:50 +0200
commitb1832c8bef99be60acf7923fad2c58a726bfeecb (patch)
tree938932cb4b36be57b0261cac8ed4c4d8f6aa3efe /apps/files_trashbin/tests
parent1d72073e349bf6926a13c085495c44fce2406e61 (diff)
downloadnextcloud-server-b1832c8bef99be60acf7923fad2c58a726bfeecb.tar.gz
nextcloud-server-b1832c8bef99be60acf7923fad2c58a726bfeecb.zip
Emit moveToTrash event only for the deleting user
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps/files_trashbin/tests')
-rw-r--r--apps/files_trashbin/tests/StorageTest.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files_trashbin/tests/StorageTest.php b/apps/files_trashbin/tests/StorageTest.php
index eff33f9b30c..3c660134d1c 100644
--- a/apps/files_trashbin/tests/StorageTest.php
+++ b/apps/files_trashbin/tests/StorageTest.php
@@ -36,6 +36,7 @@ use OCA\Files_Trashbin\Events\MoveToTrashEvent;
use OCA\Files_Trashbin\Storage;
use OCA\Files_Trashbin\Trash\ITrashManager;
use OCP\Files\Cache\ICache;
+use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\ILogger;
@@ -545,12 +546,14 @@ class StorageTest extends \Test\TestCase {
$logger = $this->getMockBuilder(ILogger::class)->getMock();
$eventDispatcher = $this->createMock(EventDispatcherInterface::class);
$rootFolder = $this->createMock(IRootFolder::class);
+ $userFolder = $this->createMock(Folder::class);
$node = $this->getMockBuilder(Node::class)->disableOriginalConstructor()->getMock();
$trashManager = $this->createMock(ITrashManager::class);
$event = $this->getMockBuilder(MoveToTrashEvent::class)->disableOriginalConstructor()->getMock();
$event->expects($this->any())->method('shouldMoveToTrashBin')->willReturn(!$appDisablesTrash);
- $rootFolder->expects($this->any())->method('getById')->with($fileID)->willReturn([$node]);
+ $userFolder->expects($this->any())->method('getById')->with($fileID)->willReturn([$node]);
+ $rootFolder->expects($this->any())->method('getUserFolder')->willReturn($userFolder);
$storage = $this->getMockBuilder(Storage::class)
->setConstructorArgs(