mirror of
https://github.com/wallabag/wallabag.git
synced 2025-08-01 17:38:38 +00:00
TagController: support merging labels when renaming one with label of another
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
This commit is contained in:
parent
a19caf8a37
commit
48f9a9632d
2 changed files with 143 additions and 11 deletions
|
@ -304,6 +304,133 @@ class TagControllerTest extends WallabagCoreTestCase
|
|||
$this->assertTrue($newTag[0]->hasEntry($freshEntry), 'Tag is still assigned to the entry.');
|
||||
}
|
||||
|
||||
public function testRenameTagWithSameLabelDifferentCase()
|
||||
{
|
||||
$tagLabel = 'same label';
|
||||
$newTagLabel = 'saMe labEl';
|
||||
$this->logInAs('admin');
|
||||
$client = $this->getClient();
|
||||
|
||||
$tag = new Tag();
|
||||
$tag->setLabel($tagLabel);
|
||||
|
||||
$entry = new Entry($this->getLoggedInUser());
|
||||
$entry->setUrl('http://0.0.0.0/foobar');
|
||||
$entry->addTag($tag);
|
||||
$this->getEntityManager()->persist($entry);
|
||||
|
||||
$this->getEntityManager()->flush();
|
||||
$this->getEntityManager()->clear();
|
||||
|
||||
// We make a first request to set an history and test redirection after tag deletion
|
||||
$crawler = $client->request('GET', '/tag/list');
|
||||
$form = $crawler->filter('#tag-' . $tag->getId() . ' form')->form();
|
||||
|
||||
$data = [
|
||||
'tag[label]' => $newTagLabel,
|
||||
];
|
||||
|
||||
$client->submit($form, $data);
|
||||
$this->assertSame(302, $client->getResponse()->getStatusCode());
|
||||
$this->assertNotContains('flashes.tag.notice.tag_renamed', $crawler->filter('body')->extract(['_text'])[0]);
|
||||
|
||||
$freshEntry = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->find($entry->getId());
|
||||
|
||||
$tags = [];
|
||||
|
||||
$tagsFromEntry = $freshEntry->getTags()->toArray();
|
||||
foreach ($tagsFromEntry as $key => $item) {
|
||||
$tags[$key] = $item->getLabel();
|
||||
}
|
||||
|
||||
$this->assertFalse(array_search($newTagLabel, $tags, true));
|
||||
|
||||
$tagFromRepo = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Tag')
|
||||
->findByLabel($tagLabel);
|
||||
|
||||
$newTagFromRepo = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Tag')
|
||||
->findByLabel($newTagLabel);
|
||||
|
||||
$this->assertCount(0, $newTagFromRepo);
|
||||
$this->assertCount(1, $tagFromRepo);
|
||||
|
||||
$this->assertSame($tag->getId(), $tagFromRepo[0]->getId(), 'Tag is unchanged.');
|
||||
|
||||
$this->assertTrue($tagFromRepo[0]->hasEntry($freshEntry), 'Tag is still assigned to the entry.');
|
||||
}
|
||||
|
||||
public function testRenameTagWithExistingLabel()
|
||||
{
|
||||
$tagLabel = 'existing label';
|
||||
$previousTagLabel = 'previous label';
|
||||
$this->logInAs('admin');
|
||||
$client = $this->getClient();
|
||||
|
||||
$tag = new Tag();
|
||||
$tag->setLabel($tagLabel);
|
||||
|
||||
$previousTag = new Tag();
|
||||
$previousTag->setLabel($previousTagLabel);
|
||||
|
||||
$entry1 = new Entry($this->getLoggedInUser());
|
||||
$entry1->setUrl('http://0.0.0.0/foobar');
|
||||
$entry1->addTag($previousTag);
|
||||
$this->getEntityManager()->persist($entry1);
|
||||
|
||||
$entry2 = new Entry($this->getLoggedInUser());
|
||||
$entry2->setUrl('http://0.0.0.0/baz');
|
||||
$entry2->addTag($tag);
|
||||
$this->getEntityManager()->persist($entry2);
|
||||
|
||||
$this->getEntityManager()->flush();
|
||||
$this->getEntityManager()->clear();
|
||||
|
||||
// We make a first request to set an history and test redirection after tag deletion
|
||||
$crawler = $client->request('GET', '/tag/list');
|
||||
$form = $crawler->filter('#tag-' . $previousTag->getId() . ' form')->form();
|
||||
|
||||
$data = [
|
||||
'tag[label]' => $tagLabel,
|
||||
];
|
||||
|
||||
$client->submit($form, $data);
|
||||
$this->assertSame(302, $client->getResponse()->getStatusCode());
|
||||
$this->assertNotContains('flashes.tag.notice.tag_renamed', $crawler->filter('body')->extract(['_text'])[0]);
|
||||
|
||||
$freshEntry1 = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->find($entry1->getId());
|
||||
|
||||
$freshEntry2 = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->find($entry2->getId());
|
||||
|
||||
$tagFromRepo = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Tag')
|
||||
->findByLabel($tagLabel);
|
||||
|
||||
$previousTagFromRepo = $client->getContainer()
|
||||
->get('doctrine.orm.entity_manager')
|
||||
->getRepository('WallabagCoreBundle:Tag')
|
||||
->findByLabel($previousTagLabel);
|
||||
|
||||
$this->assertCount(1, $tagFromRepo);
|
||||
|
||||
$this->assertTrue($tagFromRepo[0]->hasEntry($freshEntry1));
|
||||
$this->assertTrue($tagFromRepo[0]->hasEntry($freshEntry2), 'Tag is assigned to the entry.');
|
||||
$this->assertFalse($previousTagFromRepo[0]->hasEntry($freshEntry1));
|
||||
}
|
||||
|
||||
public function testAddUnicodeTagLabel()
|
||||
{
|
||||
$this->logInAs('admin');
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue