Skip to content

Simplify the preview information #871

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
nickvergessen merged 13 commits into from
Aug 16, 2022
Merged

Simplify the preview information #871

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
502115d
Use the f/ link to reduce resource usage
nickvergessen Aug 15, 2022
0400519
Use IRootFolder
nickvergessen Aug 15, 2022
55c50a7
Also use the rootfolder in the trashbin path
nickvergessen Aug 15, 2022
8aac67e
Remove unused functions
nickvergessen Aug 15, 2022
f90aaab
Fix path value
nickvergessen Aug 16, 2022
bf9a7d7
Remove view
nickvergessen Aug 16, 2022
329ba7b
Fix unit tests
nickvergessen Aug 16, 2022
477a121
Fix PHPUnit warnings
nickvergessen Aug 16, 2022
b52099b
Use getRelativePath
nickvergessen Aug 16, 2022
b85ede0
Ops
nickvergessen Aug 16, 2022
19be4bf
Add a stub
nickvergessen Aug 16, 2022
59e6215
Bump api package
nickvergessen Aug 16, 2022
277e536
Fix code style
nickvergessen Aug 16, 2022
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 PHPUnit warnings 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Aug 16, 2022
commit 477a12142fd50c5de36152b34dafd2e94355f69d
74 changes: 38 additions & 36 deletions tests/FilesHooksTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,23 +453,25 @@ public function testAddNotificationsForFileAction(array $filterUsers, bool $moun
return $filterUsers[$method];
});

$i = 2;
$addCalls = [];
foreach ($addNotifications as $user => $arguments) {
$filesHooks->expects($this->at($i))
->method('addNotificationsForUser')
->with(
$user,
$arguments['subject'],
$arguments['subject_params'],
1337,
$arguments['path'],
true,
$arguments['email'],
$arguments['notification'],
Files::TYPE_SHARE_RESTORED
);
$i++;
$addCalls[] = [
$user,
$arguments['subject'],
$arguments['subject_params'],
1337,
$arguments['path'],
true,
$arguments['email'],
$arguments['notification'],
Files::TYPE_SHARE_RESTORED,
];
}
$filesHooks->expects($this->any())
->method('addNotificationsForUser')
->withConsecutive(
...$addCalls
);

self::invokePrivate($filesHooks, 'addNotificationsForFileAction', ['path', Files::TYPE_SHARE_RESTORED, 'restored_self', 'restored_by']);
}
Expand Down Expand Up @@ -676,12 +678,10 @@ public function testShareWithGroup(array $usersInGroup, int $settingCalls, int $
]);

$group = $this->createMock(IGroup::class);
for ($i = 0, $iMax = count($usersInGroup); $i < $iMax; $i++) {
$group->expects($this->at($i))
->method('searchUsers')
->with('')
->willReturn($usersInGroup[$i]);
}
$group->expects($this->any())
->method('searchUsers')
->with('')
->willReturnOnConsecutiveCalls(...$usersInGroup);

$this->groupManager->expects($this->once())
->method('get')
Expand All @@ -705,23 +705,25 @@ public function testShareWithGroup(array $usersInGroup, int $settingCalls, int $
->with('user', 'reshared_group_by', 'group1', 42, 'file')
->willReturnArgument(0);

$i = 3;
$addCalls = [];
foreach ($addNotifications as $user => $arguments) {
$filesHooks->expects($this->at($i))
->method('addNotificationsForUser')
->with(
$user,
$arguments['subject'],
$arguments['subject_params'],
42,
$arguments['path'],
true,
$arguments['email'],
$arguments['notification'],
Files_Sharing::TYPE_SHARED
);
$i++;
$addCalls[] = [
$user,
$arguments['subject'],
$arguments['subject_params'],
42,
$arguments['path'],
true,
$arguments['email'],
$arguments['notification'],
Files_Sharing::TYPE_SHARED,
];
}
$filesHooks->expects($this->any())
->method('addNotificationsForUser')
->withConsecutive(
...$addCalls
);

self::invokePrivate($filesHooks, 'shareWithGroup', [
'group1', 42, 'file', '/file', 1337, true
Expand Down