diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-04-07 17:14:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 17:14:05 -0500 |
| commit | ca9d25169dcdd2923a356e2a797d8704506a3787 (patch) | |
| tree | 5d94aed1a5f79a5b0abe33d8732fc60e0a4054b3 /apps/federatedfilesharing | |
| parent | 9adfa60eb38f6c39ae075e1fa68037375c8789de (diff) | |
| parent | bf30090be5e3d339c9188d81a900ed2fe4bd6318 (diff) | |
| download | nextcloud-server-ca9d25169dcdd2923a356e2a797d8704506a3787.tar.gz nextcloud-server-ca9d25169dcdd2923a356e2a797d8704506a3787.zip | |
Merge pull request #4136 from nextcloud/expire-date-for-all-shares
Unified sharing options
Diffstat (limited to 'apps/federatedfilesharing')
| -rw-r--r-- | apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php index 61f87e9ec67..233395dec9f 100644 --- a/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php +++ b/apps/federatedfilesharing/tests/Controller/RequestHandlerControllerTest.php @@ -67,7 +67,7 @@ class RequestHandlerControllerTest extends TestCase { /** @var \OCA\FederatedFileSharing\AddressHandler|\PHPUnit_Framework_MockObject_MockObject */ private $addressHandler; - + /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ private $userManager; @@ -107,7 +107,7 @@ class RequestHandlerControllerTest extends TestCase { $this->userManager = $this->getMockBuilder('OCP\IUserManager')->getMock(); $this->cloudIdManager = new CloudIdManager(); - + $this->registerHttpHelper($httpHelperMock); $this->s2s = new RequestHandlerController( @@ -384,6 +384,7 @@ class RequestHandlerControllerTest extends TestCase { 'parent' => null, 'accepted' => '0', 'expiration' => null, + 'password' => null, 'mail_send' => '0' ]; |