Skip to content

add activity logging for favorites in dav #48612

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
juliusknorr merged 3 commits into from
Dec 12, 2024
Merged

add activity logging for favorites in dav #48612

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d02d83
fix(dav): add activity logging for favorites in dav
grnd-alt Oct 24, 2024
8d953ae
refactor(tags): move favorite event dispatching to tags.php
grnd-alt Nov 18, 2024
eb61a3a
fix(tests): remove redundant unit test for activity
grnd-alt Dec 3, 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
fix(tests): remove redundant unit test for activity 
Signed-off-by: grnd-alt <[email protected]>
  • Loading branch information
@grnd-alt
grnd-alt committed Dec 3, 2024
commit eb61a3ae4480d8d07210e91fc2037e2887f9663e
40 changes: 0 additions & 40 deletions apps/files/tests/Service/TagServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@

use OCA\Files\Service\TagService;
use OCP\Activity\IManager;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\Events\NodeAddedToFavorite;
use OCP\Files\Events\NodeRemovedFromFavorite;
use OCP\Files\Folder;
use OCP\Files\NotFoundException;
use OCP\ITags;
Expand Down Expand Up @@ -43,9 +40,6 @@ class TagServiceTest extends \Test\TestCase {
*/
private $root;

/** @var IEventDispatcher|\PHPUnit\Framework\MockObject\MockObject */
private $dispatcher;

/**
* @var TagService|\PHPUnit\Framework\MockObject\MockObject
*/
Expand Down Expand Up @@ -74,7 +68,6 @@ protected function setUp(): void {
->willReturn($user);

$this->root = \OC::$server->getUserFolder();
$this->dispatcher = $this->createMock(IEventDispatcher::class);

$this->tagger = \OC::$server->getTagManager()->load('files');
$this->tagService = $this->getTagService(['addActivity']);
Expand Down Expand Up @@ -108,9 +101,6 @@ public function testUpdateFileTags(): void {
$tag1 = 'tag1';
$tag2 = 'tag2';

$this->dispatcher->expects($this->never())
->method('dispatchTyped');

$subdir = $this->root->newFolder('subdir');
$testFile = $subdir->newFile('test.txt');
$testFile->putContent('test contents');
Expand Down Expand Up @@ -142,36 +132,6 @@ public function testUpdateFileTags(): void {
}
$this->assertTrue($caught);

$subdir->delete();
}

public function testFavoriteActivity(): void {
$subdir = $this->root->newFolder('subdir');
$file = $subdir->newFile('test.txt');

$invokedCount = $this->exactly(2);

$this->dispatcher->expects($invokedCount)
->method('dispatchTyped')
->willReturnCallback(function ($event) use ($invokedCount, $file) {
if ($invokedCount->getInvocationCount() === 1) {
$this->assertInstanceOf(NodeAddedToFavorite::class, $event);
}
if ($invokedCount->getInvocationCount() === 2) {
$this->assertInstanceOf(NodeRemovedFromFavorite::class, $event);
}
$this->assertEquals($this->userSession->getUser()->getUID(), $event->getUser()->getUID());
$this->assertEquals('subdir/test.txt', $event->getPath());
$this->assertEquals($file->getId(), $event->getFileId());
});

// set tags
$this->tagService->updateFileTags('subdir/test.txt', [ITags::TAG_FAVORITE]);

// remove tag
$this->tagService->updateFileTags('subdir/test.txt', []);


$subdir->delete();
}
}
Loading