mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-02-17 03:05:19 +00:00
Code Issues Projects Releases Wiki Activity

Fix tests

Browse source
This commit is contained in:
Jeremy Benoist 2017-04-29 12:58:39 +02:00
parent 80299ed282
commit dcbebc17aa
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/ApiBundle/Controller/EntryRestController.php
View file

@ -459,7 +459,6 @@ class EntryRestController extends WallabagRestController
// handle multiple urls // handle multiple urls
if (!empty($list)) { if (!empty($list)) {
$results = [];
foreach ($list as $key => $element) { foreach ($list as $key => $element) {
$entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId( $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId(
$element->url, $element->url,
@ -517,7 +516,6 @@ class EntryRestController extends WallabagRestController
// handle multiple urls // handle multiple urls
if (!empty($list)) { if (!empty($list)) {
$results = [];
foreach ($list as $key => $element) { foreach ($list as $key => $element) {
$entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId( $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId(
$element->url, $element->url,

26
tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
View file

@ -298,7 +298,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
$entry = $this->client->getContainer() $entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager') ->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->findOneByUser(1); ->findOneByUser(1, ['id' => 'asc']);
if (!$entry) { if (!$entry) {
$this->markTestSkipped('No content found in db.'); $this->markTestSkipped('No content found in db.');
@ -719,15 +719,15 @@ class EntryRestControllerTest extends WallabagApiTestCase
{ {
$entry = $this->client->getContainer()->get('doctrine.orm.entity_manager') $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->findByUrlAndUserId('http://0.0.0.0/entry2', 1); ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
$tags = $entry->getTags(); $tags = $entry->getTags();
$this->assertCount(4, $tags); $this->assertCount(2, $tags);
$list = [ $list = [
[ [
'url' => 'http://0.0.0.0/entry2', 'url' => 'http://0.0.0.0/entry4',
'tags' => 'new tag 1, new tag 2', 'tags' => 'new tag 1, new tag 2',
], ],
]; ];
@ -739,29 +739,29 @@ class EntryRestControllerTest extends WallabagApiTestCase
$content = json_decode($this->client->getResponse()->getContent(), true); $content = json_decode($this->client->getResponse()->getContent(), true);
$this->assertInternalType('int', $content[0]['entry']); $this->assertInternalType('int', $content[0]['entry']);
$this->assertEquals('http://0.0.0.0/entry2', $content[0]['url']); $this->assertEquals('http://0.0.0.0/entry4', $content[0]['url']);
$entry = $this->client->getContainer()->get('doctrine.orm.entity_manager') $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->findByUrlAndUserId('http://0.0.0.0/entry2', 1); ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
$tags = $entry->getTags(); $tags = $entry->getTags();
$this->assertCount(6, $tags); $this->assertCount(4, $tags);
} }
public function testDeleteEntriesTagsListAction() public function testDeleteEntriesTagsListAction()
{ {
$entry = $this->client->getContainer()->get('doctrine.orm.entity_manager') $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->findByUrlAndUserId('http://0.0.0.0/entry2', 1); ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
$tags = $entry->getTags(); $tags = $entry->getTags();
$this->assertCount(6, $tags); $this->assertCount(4, $tags);
$list = [ $list = [
[ [
'url' => 'http://0.0.0.0/entry2', 'url' => 'http://0.0.0.0/entry4',
'tags' => 'new tag 1, new tag 2', 'tags' => 'new tag 1, new tag 2',
], ],
]; ];
@ -773,13 +773,13 @@ class EntryRestControllerTest extends WallabagApiTestCase
$content = json_decode($this->client->getResponse()->getContent(), true); $content = json_decode($this->client->getResponse()->getContent(), true);
$this->assertInternalType('int', $content[0]['entry']); $this->assertInternalType('int', $content[0]['entry']);
$this->assertEquals('http://0.0.0.0/entry2', $content[0]['url']); $this->assertEquals('http://0.0.0.0/entry4', $content[0]['url']);
$entry = $this->client->getContainer()->get('doctrine.orm.entity_manager') $entry = $this->client->getContainer()->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->findByUrlAndUserId('http://0.0.0.0/entry2', 1); ->findByUrlAndUserId('http://0.0.0.0/entry4', 1);
$tags = $entry->getTags(); $tags = $entry->getTags();
$this->assertCount(4, $tags); $this->assertCount(2, $tags);
} }
} }