mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-13 12:31:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix tag test

Browse source
This commit is contained in:
Jeremy Benoist 2016-10-02 16:53:52 +02:00
parent 6c8806cadc
commit 74e1f7433a
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Wallabag/CoreBundle/Helper/EntriesExport.php
View file

@ -21,7 +21,6 @@ class EntriesExport
private $entries = []; private $entries = [];
private $authors = ['wallabag']; private $authors = ['wallabag'];
private $language = ''; private $language = '';
private $tags = [];
private $footerTemplate = '<div style="text-align:center;"> private $footerTemplate = '<div style="text-align:center;">
<p>Produced by wallabag with %EXPORT_METHOD%</p> <p>Produced by wallabag with %EXPORT_METHOD%</p>
<p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p> <p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p>

2
tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php
View file

@ -193,7 +193,7 @@ class ExportControllerTest extends WallabagCoreTestCase
$contentInDB = $client->getContainer() $contentInDB = $client->getContainer()
->get('doctrine.orm.entity_manager') ->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->findOneByUsernameAndNotArchived('admin'); ->findByUrlAndUserId('http://0.0.0.0/entry1', $this->getLoggedInUserId());
ob_start(); ob_start();
$crawler = $client->request('GET', '/export/'.$contentInDB->getId().'.json'); $crawler = $client->request('GET', '/export/'.$contentInDB->getId().'.json');

26
tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
View file

@ -26,7 +26,7 @@ class TagControllerTest extends WallabagCoreTestCase
$entry = $client->getContainer() $entry = $client->getContainer()
->get('doctrine.orm.entity_manager') ->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->findOneByUsernameAndNotArchived('admin'); ->findByUrlAndUserId('http://0.0.0.0/entry1', $this->getLoggedInUserId());
$crawler = $client->request('GET', '/view/'.$entry->getId()); $crawler = $client->request('GET', '/view/'.$entry->getId());
@ -43,9 +43,9 @@ class TagControllerTest extends WallabagCoreTestCase
$entry = $client->getContainer() $entry = $client->getContainer()
->get('doctrine.orm.entity_manager') ->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->findOneByUsernameAndNotArchived('admin'); ->findByUrlAndUserId('http://0.0.0.0/entry1', $this->getLoggedInUserId());
$this->assertEquals(1, count($entry->getTags())); $this->assertEquals(3, count($entry->getTags()));
// tag already exists and already assigned // tag already exists and already assigned
$client->submit($form, $data); $client->submit($form, $data);
@ -56,7 +56,7 @@ class TagControllerTest extends WallabagCoreTestCase
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->find($entry->getId()); ->find($entry->getId());
$this->assertEquals(1, count($newEntry->getTags())); $this->assertEquals(3, count($newEntry->getTags()));
// tag already exists but still not assigned to this entry // tag already exists but still not assigned to this entry
$data = [ $data = [
@ -71,7 +71,7 @@ class TagControllerTest extends WallabagCoreTestCase
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->find($entry->getId()); ->find($entry->getId());
$this->assertEquals(2, count($newEntry->getTags())); $this->assertEquals(3, count($newEntry->getTags()));
} }
public function testAddMultipleTagToEntry() public function testAddMultipleTagToEntry()
@ -82,7 +82,7 @@ class TagControllerTest extends WallabagCoreTestCase
$entry = $client->getContainer() $entry = $client->getContainer()
->get('doctrine.orm.entity_manager') ->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->findOneByUsernameAndNotArchived('admin'); ->findByUrlAndUserId('http://0.0.0.0/entry2', $this->getLoggedInUserId());
$crawler = $client->request('GET', '/view/'.$entry->getId()); $crawler = $client->request('GET', '/view/'.$entry->getId());
@ -101,9 +101,13 @@ class TagControllerTest extends WallabagCoreTestCase
->find($entry->getId()); ->find($entry->getId());
$tags = $newEntry->getTags()->toArray(); $tags = $newEntry->getTags()->toArray();
foreach ($tags as $key => $tag) {
$tags[$key] = $tag->getLabel();
}
$this->assertGreaterThanOrEqual(2, count($tags)); $this->assertGreaterThanOrEqual(2, count($tags));
$this->assertNotEquals(false, array_search('foo2', $tags), 'Tag foo2 is assigned to the entry'); $this->assertNotFalse(array_search('foo2', $tags), 'Tag foo2 is assigned to the entry');
$this->assertNotEquals(false, array_search('bar2', $tags), 'Tag bar2 is assigned to the entry'); $this->assertNotFalse(array_search('bar2', $tags), 'Tag bar2 is assigned to the entry');
} }
public function testRemoveTagFromEntry() public function testRemoveTagFromEntry()
@ -114,7 +118,7 @@ class TagControllerTest extends WallabagCoreTestCase
$entry = $client->getContainer() $entry = $client->getContainer()
->get('doctrine.orm.entity_manager') ->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->findOneByUsernameAndNotArchived('admin'); ->findByUrlAndUserId('http://0.0.0.0/entry1', $this->getLoggedInUserId());
$tag = $client->getContainer() $tag = $client->getContainer()
->get('doctrine.orm.entity_manager') ->get('doctrine.orm.entity_manager')
@ -140,7 +144,7 @@ class TagControllerTest extends WallabagCoreTestCase
$entry = $client->getContainer() $entry = $client->getContainer()
->get('doctrine.orm.entity_manager') ->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->findOneByUsernameAndNotArchived('admin'); ->findByUrlAndUserId('http://0.0.0.0/entry4', $this->getLoggedInUserId());
$tag = $client->getContainer() $tag = $client->getContainer()
->get('doctrine.orm.entity_manager') ->get('doctrine.orm.entity_manager')
@ -160,6 +164,6 @@ class TagControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/tag/list/'.$tag->getSlug()); $crawler = $client->request('GET', '/tag/list/'.$tag->getSlug());
$this->assertEquals(200, $client->getResponse()->getStatusCode()); $this->assertEquals(200, $client->getResponse()->getStatusCode());
$this->assertCount(0, $crawler->filter('div[class=entry]')); $this->assertCount(1, $crawler->filter('div[class=entry]'));
} }
} }