summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-10-15 21:40:43 +0200
committerGitHub <noreply@github.com>2017-10-15 21:40:43 +0200
commita0823540b0649a267d76fa1f9db2194a5dcc69a1 (patch)
tree887add52d5ed3752ec3cea3f53711ab42e42c0e6 /apps/files_trashbin
parent3438020d667c976a28fcefe54f2554865ca0f352 (diff)
parent281f0420938ad55234f17a3649b2eca218fca5a3 (diff)
downloadnextcloud-server-a0823540b0649a267d76fa1f9db2194a5dcc69a1.tar.gz
nextcloud-server-a0823540b0649a267d76fa1f9db2194a5dcc69a1.zip
Merge pull request #6791 from nextcloud/fix-test-warnings
Fix test warnings
Diffstat (limited to 'apps/files_trashbin')
-rw-r--r--apps/files_trashbin/tests/StorageTest.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_trashbin/tests/StorageTest.php b/apps/files_trashbin/tests/StorageTest.php
index 2e3ddf2e6bf..bdddafcf016 100644
--- a/apps/files_trashbin/tests/StorageTest.php
+++ b/apps/files_trashbin/tests/StorageTest.php
@@ -530,7 +530,7 @@ class StorageTest extends \Test\TestCase {
*/
public function testShouldMoveToTrash($mountPoint, $path, $userExists, $appDisablesTrash, $expected) {
$fileID = 1;
- $cache = $this->getMock(ICache::class);
+ $cache = $this->createMock(ICache::class);
$cache->expects($this->any())->method('getId')->willReturn($fileID);
$tmpStorage = $this->getMockBuilder('\OC\Files\Storage\Temporary')
->disableOriginalConstructor()->getMock($cache);
@@ -542,7 +542,7 @@ class StorageTest extends \Test\TestCase {
$logger = $this->getMockBuilder(ILogger::class)->getMock();
$eventDispatcher = $this->getMockBuilder(EventDispatcher::class)
->disableOriginalConstructor()->getMock();
- $rootFolder = $this->getMock(IRootFolder::class);
+ $rootFolder = $this->createMock(IRootFolder::class);
$node = $this->getMockBuilder(Node::class)->disableOriginalConstructor()->getMock();
$event = $this->getMockBuilder(MoveToTrashEvent::class)->disableOriginalConstructor()->getMock();
$event->expects($this->any())->method('shouldMoveToTrashBin')->willReturn(!$appDisablesTrash);