summaryrefslogtreecommitdiffstats
path: root/apps/files/tests/Activity/ProviderTest.php
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2018-03-01 10:51:27 +0100
committerGitHub <noreply@github.com>2018-03-01 10:51:27 +0100
commit0f3ba9444e8b683ba89e100b6a43cab70b3788b9 (patch)
tree4e1c0b34956e6f813064e10d17a35cb5cdb988ca /apps/files/tests/Activity/ProviderTest.php
parent6b4a2d01c320538506e890664983ee823b76fd57 (diff)
parent8b73560cac73e7e3f406514abc5a08a87cede0df (diff)
downloadnextcloud-server-0f3ba9444e8b683ba89e100b6a43cab70b3788b9.tar.gz
nextcloud-server-0f3ba9444e8b683ba89e100b6a43cab70b3788b9.zip
Merge pull request #8298 from nextcloud/bugfix/e2e-45/fix-activities-for-end2end-encryption
Fix activities for e2e encryption
Diffstat (limited to 'apps/files/tests/Activity/ProviderTest.php')
-rw-r--r--apps/files/tests/Activity/ProviderTest.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/files/tests/Activity/ProviderTest.php b/apps/files/tests/Activity/ProviderTest.php
index 4a835f42d75..f178ff195e4 100644
--- a/apps/files/tests/Activity/ProviderTest.php
+++ b/apps/files/tests/Activity/ProviderTest.php
@@ -28,6 +28,7 @@ use OCA\Files\Activity\Provider;
use OCP\Activity\IEvent;
use OCP\Activity\IEventMerger;
use OCP\Activity\IManager;
+use OCP\Files\IRootFolder;
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserManager;
@@ -49,6 +50,8 @@ class ProviderTest extends TestCase {
protected $activityManager;
/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */
protected $userManager;
+ /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */
+ protected $rootFolder;
/** @var IEventMerger|\PHPUnit_Framework_MockObject_MockObject */
protected $eventMerger;
@@ -59,6 +62,7 @@ class ProviderTest extends TestCase {
$this->url = $this->createMock(IURLGenerator::class);
$this->activityManager = $this->createMock(IManager::class);
$this->userManager = $this->createMock(IUserManager::class);
+ $this->rootFolder = $this->createMock(IRootFolder::class);
$this->eventMerger = $this->createMock(IEventMerger::class);
}
@@ -74,6 +78,7 @@ class ProviderTest extends TestCase {
$this->url,
$this->activityManager,
$this->userManager,
+ $this->rootFolder,
$this->eventMerger,
])
->setMethods($methods)
@@ -84,6 +89,7 @@ class ProviderTest extends TestCase {
$this->url,
$this->activityManager,
$this->userManager,
+ $this->rootFolder,
$this->eventMerger
);
}