Skip to content

[stable28] fix: promote re-shares when deleting the parent share #49931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luka-nextcloud merged 11 commits into from
Jan 6, 2025
Merged

[stable28] fix: promote re-shares when deleting the parent share #49931

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7a3a779
fix: delete re-shares when deleting the parent share
luka-nextcloud Aug 7, 2024
257b516
fix: Tidy up code for reshare deletion
come-nc Aug 22, 2024
58b64ad
fix: Transfer incomming shares first, do not delete non-migratable ones
come-nc Aug 26, 2024
c647d6c
fix(shares): Promote reshares into direct shares when share is deleted
come-nc Sep 13, 2024
fd95d1e
chore: Turn method description into phpdoc
come-nc Sep 15, 2024
a24460d
chore: Add comment to make code clearer
come-nc Sep 16, 2024
8bc34e9
fix(tests): Fix share tests to test new reshare promotion system
come-nc Oct 3, 2024
69e5ae7
fix(tests): Revert changes to tests now that reshares are not deleted…
come-nc Oct 8, 2024
30fdc6c
fix: Fix promotion of reshares from subsubfolders
come-nc Oct 14, 2024
3f695c6
fix: Use getRelativePath method to check if node is inside folder
come-nc Oct 14, 2024
4c10a79
chore: Remove syntax incompatible with PHP 8.0
come-nc Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(tests): Fix share tests to test new reshare promotion system 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc @backportbot
come-nc authored and backportbot[bot] committed Dec 20, 2024
commit 8bc34e99f6fd76cc6303bd226fef0ee620e67b99
34 changes: 17 additions & 17 deletions tests/lib/Share20/ManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public function dataTestDelete() {
*/
public function testDelete($shareType, $sharedWith) {
$manager = $this->createManagerMock()
->setMethods(['getShareById', 'deleteChildren', 'deleteReshares'])
->setMethods(['getShareById', 'deleteChildren', 'promoteReshares'])
->getMock();

$manager->method('deleteChildren')->willReturn([]);
Expand All @@ -260,7 +260,7 @@ public function testDelete($shareType, $sharedWith) {
->setTarget('myTarget');

$manager->expects($this->once())->method('deleteChildren')->with($share);
$manager->expects($this->once())->method('deleteReshares')->with($share);
$manager->expects($this->once())->method('promoteReshares')->with($share);

$this->defaultProvider
->expects($this->once())
Expand All @@ -285,7 +285,7 @@ public function testDelete($shareType, $sharedWith) {

public function testDeleteLazyShare() {
$manager = $this->createManagerMock()
->setMethods(['getShareById', 'deleteChildren', 'deleteReshares'])
->setMethods(['getShareById', 'deleteChildren', 'promoteReshares'])
->getMock();

$manager->method('deleteChildren')->willReturn([]);
Expand All @@ -304,7 +304,7 @@ public function testDeleteLazyShare() {
$this->rootFolder->expects($this->never())->method($this->anything());

$manager->expects($this->once())->method('deleteChildren')->with($share);
$manager->expects($this->once())->method('deleteReshares')->with($share);
$manager->expects($this->once())->method('promoteReshares')->with($share);

$this->defaultProvider
->expects($this->once())
Expand All @@ -329,7 +329,7 @@ public function testDeleteLazyShare() {

public function testDeleteNested() {
$manager = $this->createManagerMock()
->setMethods(['getShareById', 'deleteReshares'])
->setMethods(['getShareById', 'promoteReshares'])
->getMock();

$path = $this->createMock(File::class);
Expand Down Expand Up @@ -486,9 +486,9 @@ public function testDeleteChildren() {
$this->assertSame($shares, $result);
}

public function testDeleteReshareWhenUserHasOneShare(): void {
public function testPromoteReshareWhenUserHasOneShare(): void {
$manager = $this->createManagerMock()
->setMethods(['deleteShare', 'getSharesInFolder', 'generalCreateChecks'])
->setMethods(['updateShare', 'getSharesInFolder', 'generalCreateChecks'])
->getMock();

$folder = $this->createMock(Folder::class);
Expand All @@ -513,14 +513,14 @@ public function testDeleteReshareWhenUserHasOneShare(): void {
$this->defaultProvider->method('getSharesBy')
->willReturn([$reShare]);

$manager->expects($this->atLeast(2))->method('deleteShare')->withConsecutive([$reShare], [$reShareInSubFolder]);
$manager->expects($this->atLeast(2))->method('updateShare')->withConsecutive([$reShare], [$reShareInSubFolder]);

self::invokePrivate($manager, 'deleteReshares', [$share]);
self::invokePrivate($manager, 'promoteReshares', [$share]);
}

public function testDeleteReshareWhenUserHasAnotherShare(): void {
public function testPromoteReshareWhenUserHasAnotherShare(): void {
$manager = $this->createManagerMock()
->setMethods(['deleteShare', 'getSharesInFolder', 'getSharedWith', 'generalCreateChecks'])
->setMethods(['updateShare', 'getSharesInFolder', 'getSharedWith', 'generalCreateChecks'])
->getMock();

$folder = $this->createMock(Folder::class);
Expand All @@ -541,14 +541,14 @@ public function testDeleteReshareWhenUserHasAnotherShare(): void {
$manager->method('getSharesInFolder')->willReturn([]);
$manager->method('generalCreateChecks')->willReturn(true);

$manager->expects($this->never())->method('deleteShare');
$manager->expects($this->never())->method('updateShare');

self::invokePrivate($manager, 'deleteReshares', [$share]);
self::invokePrivate($manager, 'promoteReshares', [$share]);
}

public function testDeleteReshareOfUsersInGroupShare(): void {
public function testPromoteReshareOfUsersInGroupShare(): void {
$manager = $this->createManagerMock()
->setMethods(['deleteShare', 'getSharesInFolder', 'getSharedWith', 'generalCreateChecks'])
->setMethods(['updateShare', 'getSharesInFolder', 'getSharedWith', 'generalCreateChecks'])
->getMock();

$folder = $this->createMock(Folder::class);
Expand Down Expand Up @@ -590,9 +590,9 @@ public function testDeleteReshareOfUsersInGroupShare(): void {
$manager->method('getSharedWith')->willReturn([]);
$manager->expects($this->exactly(2))->method('getSharesInFolder')->willReturnOnConsecutiveCalls([[$reShare1]], [[$reShare2]]);

$manager->expects($this->exactly(2))->method('deleteShare')->withConsecutive([$reShare1], [$reShare2]);
$manager->expects($this->exactly(2))->method('updateShare')->withConsecutive([$reShare1], [$reShare2]);

self::invokePrivate($manager, 'deleteReshares', [$share]);
self::invokePrivate($manager, 'promoteReshares', [$share]);
}

public function testGetShareById(): void {
Expand Down