aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2025-04-14 17:09:20 +0200
committerskjnldsv <skjnldsv@protonmail.com>2025-04-14 20:08:02 +0200
commit67c06622fa1bb8a77a01d76c1d0bb6903c2145fb (patch)
tree2ac3e6b720cd6531bed8ccc5ffd6f89a66ee1198
parent4c67fe85219a727ae6c8b0262edffdd6238b8d61 (diff)
downloadnextcloud-server-skjnldsv-patch-1.tar.gz
nextcloud-server-skjnldsv-patch-1.zip
fix(tests): Share manager error message from #52076skjnldsv-patch-1
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
-rw-r--r--lib/private/Share20/Manager.php2
-rw-r--r--tests/lib/Share20/ManagerTest.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index db13a72e0bd..c7a42bbbf02 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -632,7 +632,7 @@ class Manager implements IManager {
$mounts = $this->mountManager->findIn($path->getPath());
foreach ($mounts as $mount) {
if ($mount->getStorage()->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
- throw new \InvalidArgumentException('Path contains files shared with you');
+ throw new \InvalidArgumentException('You cannot share a folder that contains other shares');
}
}
}
diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php
index 461bddf3db6..e69afda4ada 100644
--- a/tests/lib/Share20/ManagerTest.php
+++ b/tests/lib/Share20/ManagerTest.php
@@ -2273,7 +2273,7 @@ class ManagerTest extends \Test\TestCase {
public function testPathCreateChecksContainsSharedMount() {
$this->expectException(\InvalidArgumentException::class);
- $this->expectExceptionMessage('Path contains files shared with you');
+ $this->expectExceptionMessage('You cannot share a folder that contains other shares');
$path = $this->createMock(Folder::class);
$path->method('getPath')->willReturn('path');