diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2016-06-07 14:17:22 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2016-06-07 15:09:25 +0200 |
| commit | 2e2ece753f4474d4ba0edbf22e4984335eec51ff (patch) | |
| tree | e603a42bcce1711224b35ab564424da2cfd5878e /apps/files_sharing/tests/API | |
| parent | 7c040c0bf97c2d3a63051a819dc480403d3b96fb (diff) | |
| download | nextcloud-server-2e2ece753f4474d4ba0edbf22e4984335eec51ff.tar.gz nextcloud-server-2e2ece753f4474d4ba0edbf22e4984335eec51ff.zip | |
Fix unit tests
Diffstat (limited to 'apps/files_sharing/tests/API')
| -rw-r--r-- | apps/files_sharing/tests/API/Share20OCSTest.php | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/apps/files_sharing/tests/API/Share20OCSTest.php b/apps/files_sharing/tests/API/Share20OCSTest.php index 02b16d7bf88..b760a0f47a0 100644 --- a/apps/files_sharing/tests/API/Share20OCSTest.php +++ b/apps/files_sharing/tests/API/Share20OCSTest.php @@ -433,8 +433,12 @@ class Share20OCSTest extends \Test\TestCase { ->method('getRelativePath') ->will($this->returnArgument(0)); + $userFolder->method('getById') + ->with($share->getNodeId()) + ->willReturn([$share->getNode()]); + $this->rootFolder->method('getUserFolder') - ->with($share->getShareOwner()) + ->with($this->currentUser->getUID()) ->willReturn($userFolder); $this->urlGenerator @@ -2006,8 +2010,19 @@ class Share20OCSTest extends \Test\TestCase { ->willReturn('myLink'); - $this->rootFolder->method('getUserFolder')->with($share->getShareOwner())->will($this->returnSelf()); - $this->rootFolder->method('getRelativePath')->will($this->returnArgument(0)); + $this->rootFolder->method('getUserFolder') + ->with($this->currentUser->getUID()) + ->will($this->returnSelf()); + + if (!$exception) { + $this->rootFolder->method('getById') + ->with($share->getNodeId()) + ->willReturn([$share->getNode()]); + + $this->rootFolder->method('getRelativePath') + ->with($share->getNode()->getPath()) + ->will($this->returnArgument(0)); + } try { $result = $this->invokePrivate($this->ocs, 'formatShare', [$share]); |