fix: mock IRootFolder::getUserFolder instead of impl

Signed-off-by: Josh <josh.t.richards@gmail.com>

Author: joshtrichards

apps/dav/tests/unit/Upload/UploadHomeTest.php

@@ -133,18 +133,16 @@ public function testCreateDirectoryAddsCleanupJob(): void {
 		$userSession->method('getUser')->willReturn($user);
 		$shareManager = $this->createMock(IManager::class);
 
-		$uploadHome = $this->getMockBuilder(UploadHome::class)
-			->setConstructorArgs([
-				$this->principalInfo,
-				$cleanup,
-				$rootFolder,
-				$userSession,
-				$shareManager,
-			])
-			->onlyMethods(['impl'])
-			->getMock();
+		// make getUserFolder('testuser') return $directory, so impl() works as expected
+		$rootFolder->method('getUserFolder')->with('testuser')->willReturn($directory);
 
-		$uploadHome->method('impl')->willReturn($directory);
+		$uploadHome = new UploadHome(
+			$this->principalInfo,
+			$cleanup,
+			$rootFolder,
+			$userSession,
+			$shareManager
+		);
 
 		$uploadHome->createDirectory('foo');
 	}
@@ -164,6 +162,8 @@ public function testGetChildReturnsUploadFolder(): void {
 
 		$storage = $this->createMock(IStorage::class);
 
+		$rootFolder->method('getUserFolder')->with('testuser')->willReturn($directory);
+
 		$uploadHome = $this->getMockBuilder(UploadHome::class)
 			->setConstructorArgs([
 				$this->principalInfo,
@@ -172,10 +172,9 @@ public function testGetChildReturnsUploadFolder(): void {
 				$userSession,
 				$shareManager,
 			])
-			->onlyMethods(['impl', 'getStorage'])
+			->onlyMethods(['getStorage'])
 			->getMock();
 
-		$uploadHome->method('impl')->willReturn($directory);
 		$uploadHome->method('getStorage')->willReturn($storage);
 
 		$result = $uploadHome->getChild('childname');
@@ -196,6 +195,8 @@ public function testGetChildThrowsExceptionIfNotFound(): void {
 
 		$storage = $this->createMock(IStorage::class);
 
+		$rootFolder->method('getUserFolder')->with('testuser')->willReturn($directory);
+
 		$uploadHome = $this->getMockBuilder(UploadHome::class)
 			->setConstructorArgs([
 				$this->principalInfo,
@@ -204,10 +205,9 @@ public function testGetChildThrowsExceptionIfNotFound(): void {
 				$userSession,
 				$shareManager,
 			])
-			->onlyMethods(['impl', 'getStorage'])
+			->onlyMethods(['getStorage'])
 			->getMock();
 
-		$uploadHome->method('impl')->willReturn($directory);
 		$uploadHome->method('getStorage')->willReturn($storage);
 
 		$this->expectException(SabreNotFound::class);
@@ -230,6 +230,8 @@ public function testGetChildrenReturnsUploadFolders(): void {
 
 		$storage = $this->createMock(IStorage::class);
 
+		$rootFolder->method('getUserFolder')->with('testuser')->willReturn($directory);
+
 		$uploadHome = $this->getMockBuilder(UploadHome::class)
 			->setConstructorArgs([
 				$this->principalInfo,
@@ -238,10 +240,9 @@ public function testGetChildrenReturnsUploadFolders(): void {
 				$userSession,
 				$shareManager,
 			])
-			->onlyMethods(['impl', 'getStorage'])
+			->onlyMethods(['getStorage'])
 			->getMock();
 
-		$uploadHome->method('impl')->willReturn($directory);
 		$uploadHome->method('getStorage')->willReturn($storage);
 
 		$children = $uploadHome->getChildren();
@@ -287,18 +288,15 @@ public function testDeleteProxiesToImplDelete(): void {
 		$userSession->method('getUser')->willReturn($user);
 		$shareManager = $this->createMock(IManager::class);
 
-		$uploadHome = $this->getMockBuilder(UploadHome::class)
-			->setConstructorArgs([
-				$this->principalInfo,
-				$cleanup,
-				$rootFolder,
-				$userSession,
-				$shareManager,
-			])
-			->onlyMethods(['impl'])
-			->getMock();
+		$rootFolder->method('getUserFolder')->with('testuser')->willReturn($directory);
 
-		$uploadHome->method('impl')->willReturn($directory);
+		$uploadHome = new UploadHome(
+			$this->principalInfo,
+			$cleanup,
+			$rootFolder,
+			$userSession,
+			$shareManager
+		);
 
 		$uploadHome->delete();
 	}
@@ -319,18 +317,15 @@ public function testGetLastModifiedProxiesToImpl(): void {
 		$userSession->method('getUser')->willReturn($user);
 		$shareManager = $this->createMock(IManager::class);
 
-		$uploadHome = $this->getMockBuilder(UploadHome::class)
-			->setConstructorArgs([
-				$this->principalInfo,
-				$cleanup,
-				$rootFolder,
-				$userSession,
-				$shareManager,
-			])
-			->onlyMethods(['impl'])
-			->getMock();
+		$rootFolder->method('getUserFolder')->with('testuser')->willReturn($directory);
 
-		$uploadHome->method('impl')->willReturn($directory);
+		$uploadHome = new UploadHome(
+			$this->principalInfo,
+			$cleanup,
+			$rootFolder,
+			$userSession,
+			$shareManager
+		);
 
 		$this->assertEquals(1234567890, $uploadHome->getLastModified());
 	}