aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/Wallabag
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2017-09-07 07:16:26 +0200
committerGitHub <noreply@github.com>2017-09-07 07:16:26 +0200
commitf6d042f56d1f1269652e3ffee0722bbb6f842164 (patch)
tree149187e619048e845f7d4ea12ac3c75b878111f2 /tests/Wallabag
parent78b36d4dbeedd60c5aa25dbd30a2a2d41a658f94 (diff)
parent9c4a7388da9a250b30ff83c380581fe146af5bb1 (diff)
downloadwallabag-f6d042f56d1f1269652e3ffee0722bbb6f842164.tar.gz
wallabag-f6d042f56d1f1269652e3ffee0722bbb6f842164.tar.zst
wallabag-f6d042f56d1f1269652e3ffee0722bbb6f842164.zip
Merge pull request #3309 from wallabag/fix-multiple-tag-search
Multiple tag search, which was broken from API
Diffstat (limited to 'tests/Wallabag')
-rw-r--r--tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php3
-rw-r--r--tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php3
-rw-r--r--tests/Wallabag/CoreBundle/Controller/RssControllerTest.php6
3 files changed, 8 insertions, 4 deletions
diff --git a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
index f4c8a630..fcec3f3b 100644
--- a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
+++ b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
@@ -292,6 +292,9 @@ class EntryRestControllerTest extends WallabagApiTestCase
292 $this->assertSame(1, $content['page']); 292 $this->assertSame(1, $content['page']);
293 $this->assertGreaterThanOrEqual(1, $content['pages']); 293 $this->assertGreaterThanOrEqual(1, $content['pages']);
294 294
295 $this->assertContains('foo', array_column($content['_embedded']['items'][0]['tags'], 'label'), 'Entries tags should have "foo" tag');
296 $this->assertContains('bar', array_column($content['_embedded']['items'][0]['tags'], 'label'), 'Entries tags should have "bar" tag');
297
295 $this->assertArrayHasKey('_links', $content); 298 $this->assertArrayHasKey('_links', $content);
296 $this->assertArrayHasKey('self', $content['_links']); 299 $this->assertArrayHasKey('self', $content['_links']);
297 $this->assertArrayHasKey('first', $content['_links']); 300 $this->assertArrayHasKey('first', $content['_links']);
diff --git a/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php
index 3e216381..ab7f23cc 100644
--- a/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php
@@ -239,7 +239,8 @@ class ExportControllerTest extends WallabagCoreTestCase
239 $this->assertSame($contentInDB->getLanguage(), $content[0]['language']); 239 $this->assertSame($contentInDB->getLanguage(), $content[0]['language']);
240 $this->assertSame($contentInDB->getReadingtime(), $content[0]['reading_time']); 240 $this->assertSame($contentInDB->getReadingtime(), $content[0]['reading_time']);
241 $this->assertSame($contentInDB->getDomainname(), $content[0]['domain_name']); 241 $this->assertSame($contentInDB->getDomainname(), $content[0]['domain_name']);
242 $this->assertSame(['foo bar', 'baz'], $content[0]['tags']); 242 $this->assertContains('baz', $content[0]['tags']);
243 $this->assertContains('foo', $content[0]['tags']);
243 } 244 }
244 245
245 public function testXmlExport() 246 public function testXmlExport()
diff --git a/tests/Wallabag/CoreBundle/Controller/RssControllerTest.php b/tests/Wallabag/CoreBundle/Controller/RssControllerTest.php
index 6167fe2d..c6ca4937 100644
--- a/tests/Wallabag/CoreBundle/Controller/RssControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/RssControllerTest.php
@@ -184,13 +184,13 @@ class RssControllerTest extends WallabagCoreTestCase
184 $em->flush(); 184 $em->flush();
185 185
186 $client = $this->getClient(); 186 $client = $this->getClient();
187 $client->request('GET', '/admin/SUPERTOKEN/tags/foo-bar.xml'); 187 $client->request('GET', '/admin/SUPERTOKEN/tags/foo.xml');
188 188
189 $this->assertSame(200, $client->getResponse()->getStatusCode()); 189 $this->assertSame(200, $client->getResponse()->getStatusCode());
190 190
191 $this->validateDom($client->getResponse()->getContent(), 'tag (foo bar)', 'tags/foo-bar'); 191 $this->validateDom($client->getResponse()->getContent(), 'tag (foo)', 'tags/foo');
192 192
193 $client->request('GET', '/admin/SUPERTOKEN/tags/foo-bar.xml?page=3000'); 193 $client->request('GET', '/admin/SUPERTOKEN/tags/foo.xml?page=3000');
194 $this->assertSame(302, $client->getResponse()->getStatusCode()); 194 $this->assertSame(302, $client->getResponse()->getStatusCode());
195 } 195 }
196} 196}