fixup! fix: fix more tests

Signed-off-by: Côme Chilliet <[email protected]>

Author: come-nc

apps/files_sharing/tests/Controller/ShareAPIControllerTest.php

@@ -5011,20 +5011,19 @@ function ($user) {
 			->with('files_sharing.sharecontroller.showShare', ['token' => 'myToken'])
 			->willReturn('myLink');
 
-		$this->rootFolder->method('getUserFolder')
-			->with($this->currentUser)
-			->willReturnSelf();
-		$this->dateTimeZone->method('getTimezone')->willReturn(new \DateTimeZone('UTC'));
-
+		$userFolder = $this->createMock(IUserFolder::class);
 		if (!$exception) {
-			$this->rootFolder->method('getFirstNodeById')
+			$userFolder->method('getFirstNodeById')
 				->with($share->getNodeId())
 				->willReturn($share->getNode());
 
-			$this->rootFolder->method('getRelativePath')
+			$userFolder->method('getRelativePath')
 				->with($share->getNode()->getPath())
 				->willReturnArgument(0);
 		}
+		$this->rootFolder->method('getUserFolder')->with($this->currentUser)->willReturn($userFolder);
+		$this->dateTimeZone->method('getTimezone')->willReturn(new \DateTimeZone('UTC'));
+
 
 		$cm = $this->createMock(\OCP\Contacts\IManager::class);
 		$this->overwriteService(\OCP\Contacts\IManager::class, $cm);
@@ -5204,17 +5203,14 @@ public function testFormatRoomShare(array $expects, bool $helperAvailable, array
 			->setNote('personal note')
 			->setId(42);
 
-		$this->rootFolder->method('getUserFolder')
-			->with($this->currentUser)
-			->willReturnSelf();
-
-		$this->rootFolder->method('getFirstNodeById')
+		$userFolder = $this->createMock(IUserFolder::class);
+		$userFolder->method('getFirstNodeById')
 			->with($share->getNodeId())
 			->willReturn($share->getNode());
-
-		$this->rootFolder->method('getRelativePath')
+		$userFolder->method('getRelativePath')
 			->with($share->getNode()->getPath())
 			->willReturnArgument(0);
+		$this->rootFolder->method('getUserFolder')->with($this->currentUser)->willReturn($userFolder);
 
 		if (!$helperAvailable) {
 			$this->appManager->method('isEnabledForUser')
@@ -5361,17 +5357,14 @@ public function testFormatShareWithFederatedShare(bool $isKnownServer, bool $isT
 
 		$this->previewManager->method('isAvailable')->with($node)->willReturn(false);
 
-		$this->rootFolder->method('getUserFolder')
-			->with($this->currentUser)
-			->willReturnSelf();
-
-		$this->rootFolder->method('getFirstNodeById')
+		$userFolder = $this->createMock(IUserFolder::class);
+		$userFolder->method('getFirstNodeById')
 			->with($share->getNodeId())
 			->willReturn($node);
-
-		$this->rootFolder->method('getRelativePath')
+		$userFolder->method('getRelativePath')
 			->with($node->getPath())
 			->willReturnArgument(0);
+		$this->rootFolder->method('getUserFolder')->with($this->currentUser)->willReturn($userFolder);
 
 		$serverName = 'remoteserver.com';
 		$this->trustedServers->method('isTrustedServer')
@@ -5424,17 +5417,14 @@ public function testFormatShareWithFederatedShareWithAtInUsername(): void {
 
 		$this->previewManager->method('isAvailable')->with($node)->willReturn(false);
 
-		$this->rootFolder->method('getUserFolder')
-			->with($this->currentUser)
-			->willReturnSelf();
-
-		$this->rootFolder->method('getFirstNodeById')
+		$userFolder = $this->createMock(IUserFolder::class);
+		$userFolder->method('getFirstNodeById')
 			->with($share->getNodeId())
 			->willReturn($node);
-
-		$this->rootFolder->method('getRelativePath')
+		$userFolder->method('getRelativePath')
 			->with($node->getPath())
 			->willReturnArgument(0);
+		$this->rootFolder->method('getUserFolder')->with($this->currentUser)->willReturn($userFolder);
 
 		$serverName = 'remoteserver.com';
 		$this->trustedServers->method('isTrustedServer')