More fixes

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
index dc0231b19730bc3b6b89054464deb5b6490edda7..6f053eef12464e29e3cee39e8a4c0addf7a70e73 100644 (file)
--- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
@@ -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);