mirror of
https://github.com/nextcloud/server.git
synced 2025-03-16 17:24:10 +00:00
More fixes
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
This commit is contained in:
parent
8e3f21d9ed
commit
2f406e5403
1 changed files with 18 additions and 8 deletions
|
@ -1667,7 +1667,7 @@ class ShareAPIControllerTest extends TestCase {
|
|||
$share = $this->newShare();
|
||||
$this->shareManager->method('newShare')->willReturn($share);
|
||||
|
||||
[$userFolder, $path] = $this->getNonSharedUserFolder();
|
||||
[$userFolder, $path] = $this->getNonSharedUserFile();
|
||||
$this->rootFolder->expects($this->exactly(2))
|
||||
->method('getUserFolder')
|
||||
->with('currentUser')
|
||||
|
@ -1695,7 +1695,7 @@ class ShareAPIControllerTest extends TestCase {
|
|||
$share = $this->newShare();
|
||||
$this->shareManager->method('newShare')->willReturn($share);
|
||||
|
||||
[$userFolder, $path] = $this->getNonSharedUserFolder();
|
||||
[$userFolder, $path] = $this->getNonSharedUserFile();
|
||||
$this->rootFolder->expects($this->exactly(2))
|
||||
->method('getUserFolder')
|
||||
->with('currentUser')
|
||||
|
@ -1741,7 +1741,7 @@ class ShareAPIControllerTest extends TestCase {
|
|||
])->setMethods(['formatShare'])
|
||||
->getMock();
|
||||
|
||||
[$userFolder, $path] = $this->getNonSharedUserFolder();
|
||||
[$userFolder, $path] = $this->getNonSharedUserFile();
|
||||
$this->rootFolder->expects($this->exactly(2))
|
||||
->method('getUserFolder')
|
||||
->with('currentUser')
|
||||
|
@ -1791,7 +1791,7 @@ class ShareAPIControllerTest extends TestCase {
|
|||
$this->shareManager->method('createShare')->willReturnArgument(0);
|
||||
$this->shareManager->method('allowGroupSharing')->willReturn(true);
|
||||
|
||||
[$userFolder, $path] = $this->getNonSharedUserFolder();
|
||||
[$userFolder, $path] = $this->getNonSharedUserFile();
|
||||
$this->rootFolder->expects($this->exactly(2))
|
||||
->method('getUserFolder')
|
||||
->with('currentUser')
|
||||
|
@ -2244,7 +2244,7 @@ class ShareAPIControllerTest extends TestCase {
|
|||
])->setMethods(['formatShare'])
|
||||
->getMock();
|
||||
|
||||
[$userFolder, $path] = $this->getNonSharedUserFolder();
|
||||
[$userFolder, $path] = $this->getNonSharedUserFile();
|
||||
$this->rootFolder->expects($this->exactly(2))
|
||||
->method('getUserFolder')
|
||||
->with('currentUser')
|
||||
|
@ -2310,7 +2310,7 @@ class ShareAPIControllerTest extends TestCase {
|
|||
])->setMethods(['formatShare'])
|
||||
->getMock();
|
||||
|
||||
[$userFolder, $path] = $this->getNonSharedUserFolder();
|
||||
[$userFolder, $path] = $this->getNonSharedUserFile();
|
||||
$this->rootFolder->expects($this->exactly(2))
|
||||
->method('getUserFolder')
|
||||
->with('currentUser')
|
||||
|
@ -2549,19 +2549,29 @@ class ShareAPIControllerTest extends TestCase {
|
|||
])->setMethods(['formatShare'])
|
||||
->getMock();
|
||||
|
||||
[$userFolder, $path] = $this->getNonSharedUserFolder();
|
||||
$userFolder = $this->getMockBuilder(Folder::class)->getMock();
|
||||
$this->rootFolder->expects($this->exactly(2))
|
||||
->method('getUserFolder')
|
||||
->with('currentUser')
|
||||
->willReturn($userFolder);
|
||||
|
||||
$path = $this->getMockBuilder(Folder::class)->getMock();
|
||||
$storage = $this->createMock(Storage::class);
|
||||
$storage->method('instanceOfStorage')
|
||||
->willReturnMap([
|
||||
['OCA\Files_Sharing\External\Storage', true],
|
||||
['OCA\Files_Sharing\SharedStorage', false],
|
||||
]);
|
||||
$userFolder->method('getStorage')->willReturn($storage);
|
||||
$path->method('getStorage')->willReturn($storage);
|
||||
|
||||
$path->method('getPermissions')->willReturn(\OCP\Constants::PERMISSION_READ);
|
||||
$userFolder->expects($this->once())
|
||||
->method('get')
|
||||
->with('valid-path')
|
||||
->willReturn($path);
|
||||
$userFolder->method('getById')
|
||||
->willReturn([$path]);
|
||||
->willReturn([]);
|
||||
|
||||
$this->userManager->method('userExists')->with('validUser')->willReturn(true);
|
||||
|
||||
|
|
Loading…
Reference in a new issue