fix tests

nextcloud · Aug 26, 2024 · 63e897a · 63e897a
1 parent 0463791
commit 63e897a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/lib/private/Files/Node/Node.php b/lib/private/Files/Node/Node.php
@@ -432,11 +432,14 @@ public function move($targetPath) {
 		$targetPath = $this->normalizePath($targetPath);
 		$parent = $this->root->get(dirname($targetPath));
 		if (
-			$parent instanceof Folder and
-			$this->isValidPath($targetPath) and
-			(
-				$parent->isCreatable() ||
-				($parent->getInternalPath() === '' && $parent->getMountPoint() instanceof MoveableMount)
+			($parent instanceof Folder)
+			&& $this->isValidPath($targetPath)
+			&& (
+				$parent->isCreatable()
+				|| (
+					$parent->getInternalPath() === ''
+					&& ($parent->getMountPoint() instanceof MoveableMount)
+				)
 			)
 		) {
 			$nonExisting = $this->createNonExistingNode($targetPath);
@@ -460,7 +463,7 @@ public function move($targetPath) {
 			$this->path = $targetPath;
 			return $targetNode;
 		} else {
-			throw new NotPermittedException('No permission to move to path ' . $targetPath);
+			throw new NotPermittedException('No permission to move to path ' . $targetPath . ($parent instanceof Folder ? 'true':'faöse'). ($this->isValidPath($targetPath) ? 'true':'false'));
 		}
 	}
 

diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
@@ -1365,7 +1365,9 @@ public function getFileInfo($path, $includeMountPoints = true) {
 			}
 			// Ensure that parent path is valid (so it is writable)
 			try {
-				$this->verifyPath(dirname($path), basename($path));
+				if ($path && $path !== '/') {
+					$this->verifyPath(dirname($path), basename($path));
+				}
 			} catch (InvalidPathException) {
 				// Not a valid parent path so remove update and create permissions
 				$data['permissions'] &= ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE);

diff --git a/tests/lib/Files/Node/IntegrationTest.php b/tests/lib/Files/Node/IntegrationTest.php
@@ -12,6 +12,7 @@
 use OC\Files\View;
 use OC\Memcache\ArrayCache;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Files\Config\IUserMountCache;
 use OCP\Files\Mount\IMountManager;
 use OCP\ICacheFactory;
 use OCP\IUserManager;
@@ -46,8 +47,7 @@ class IntegrationTest extends \Test\TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		/** @var IMountManager $manager */
-		$manager = \OC::$server->get(IMountManager::class);
+		$manager = \OCP\Server::get(IMountManager::class);
 
 		\OC_Hook::clear('OC_Filesystem');
 
@@ -64,7 +64,7 @@ protected function setUp(): void {
 			$manager,
 			$this->view,
 			$user,
-			\OC::$server->getUserMountCache(),
+			\OCP\Server::get(IUserMountCache::class),
 			$this->createMock(LoggerInterface::class),
 			$this->createMock(IUserManager::class),
 			$this->createMock(IEventDispatcher::class),

diff --git a/tests/lib/Files/PathVerificationTest.php b/tests/lib/Files/PathVerificationTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void {
 
 	public function testPathVerificationFileNameTooLong() {
 		$this->expectException(\OCP\Files\InvalidPathException::class);
-		$this->expectExceptionMessage('File name is too long');
+		$this->expectExceptionMessage('Filename is too long');
 
 		$fileName = str_repeat('a', 500);
 		$this->view->verifyPath('', $fileName);