From 39133eb796996701228501f898b4ef33af8e0fdb Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sat, 4 Apr 2020 21:03:22 +0200 Subject: TagController: fix duplicated tags when renaming them The fix relies on a workaround available on TagsAssigner, see the AssignTagsToEntry() signature for detail. I replaced the findOneByLabel in the corresponding test to assert that there is no duplicate. Fixes #4216 Signed-off-by: Kevin Decherf --- .../CoreBundle/Controller/TagControllerTest.php | 38 ++++++++++++++++++---- 1 file changed, 31 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php index 47c83a7b..20e60c32 100644 --- a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php @@ -179,15 +179,24 @@ class TagControllerTest extends WallabagCoreTestCase public function testRenameTagUsingTheFormInsideTagList() { + $newTagLabel = 'rename label'; + $this->logInAs('admin'); $client = $this->getClient(); $tag = new Tag(); $tag->setLabel($this->tagName); + $entry = new Entry($this->getLoggedInUser()); $entry->setUrl('http://0.0.0.0/foo'); $entry->addTag($tag); $this->getEntityManager()->persist($entry); + + $entry2 = new Entry($this->getLoggedInUser()); + $entry2->setUrl('http://0.0.0.0/bar'); + $entry2->addTag($tag); + $this->getEntityManager()->persist($entry); + $this->getEntityManager()->flush(); $this->getEntityManager()->clear(); @@ -196,7 +205,7 @@ class TagControllerTest extends WallabagCoreTestCase $form = $crawler->filter('#tag-' . $tag->getId() . ' form')->form(); $data = [ - 'tag[label]' => 'specific label', + 'tag[label]' => $newTagLabel, ]; $client->submit($form, $data); @@ -207,19 +216,34 @@ class TagControllerTest extends WallabagCoreTestCase ->getRepository('WallabagCoreBundle:Entry') ->find($entry->getId()); - $tags = $freshEntry->getTags()->toArray(); - foreach ($tags as $key => $item) { + $freshEntry2 = $client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->find($entry2->getId()); + + $tags = []; + + $tagsFromEntry = $freshEntry->getTags()->toArray(); + foreach ($tagsFromEntry as $key => $item) { $tags[$key] = $item->getLabel(); } - $this->assertFalse(array_search($tag->getLabel(), $tags, true), 'Previous tag is not attach to entry anymore.'); + $tagsFromEntry2 = $freshEntry2->getTags()->toArray(); + foreach ($tagsFromEntry2 as $key => $item) { + $tags[$key] = $item->getLabel(); + } + + $this->assertFalse(array_search($tag->getLabel(), $tags, true), 'Previous tag is not attach to entries anymore.'); $newTag = $client->getContainer() ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Tag') - ->findOneByLabel('specific label'); - $this->assertInstanceOf(Tag::class, $newTag, 'Tag "specific label" exists.'); - $this->assertTrue($newTag->hasEntry($freshEntry), 'Tag "specific label" is assigned to the entry.'); + ->findByLabel($newTagLabel); + + $this->assertCount(1, $newTag, 'New tag exists.'); + + $this->assertTrue($newTag[0]->hasEntry($freshEntry), 'New tag is assigned to the entry.'); + $this->assertTrue($newTag[0]->hasEntry($freshEntry2), 'New tag is assigned to the entry2.'); } public function testAddUnicodeTagLabel() -- cgit v1.2.3