From e9056dd96f9e8c2e06b5752b8de767bbedfc71ea Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 8 Jun 2017 22:51:30 +0200 Subject: [PATCH] Fix test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit de_DE is not valid language. Zataz doesn’t send a valid language in their content (they use `fr-FR`). --- .../ApiBundle/Controller/EntryRestControllerTest.php | 8 ++++---- .../ImportBundle/Controller/ReadabilityControllerTest.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php index 74ec34b17..4aa60e90d 100644 --- a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php +++ b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php @@ -345,7 +345,7 @@ class EntryRestControllerTest extends WallabagApiTestCase 'tags' => 'google', 'title' => 'New title for my article', 'content' => 'my content', - 'language' => 'de_DE', + 'language' => 'de', 'published_at' => '2016-09-08T11:55:58+0200', 'authors' => 'bob,helen', ]); @@ -362,7 +362,7 @@ class EntryRestControllerTest extends WallabagApiTestCase $this->assertEquals(1, $content['user_id']); $this->assertCount(2, $content['tags']); $this->assertSame('my content', $content['content']); - $this->assertSame('de_DE', $content['language']); + $this->assertSame('de', $content['language']); $this->assertSame('2016-09-08T11:55:58+0200', $content['published_at']); $this->assertCount(2, $content['published_by']); $this->assertContains('bob', $content['published_by']); @@ -477,7 +477,7 @@ class EntryRestControllerTest extends WallabagApiTestCase 'tags' => 'new tag '.uniqid(), 'starred' => '1', 'archive' => '0', - 'language' => 'de_DE', + 'language' => 'de_AT', 'preview_picture' => 'http://preview.io/picture.jpg', 'authors' => 'bob,sponge', 'content' => 'awesome', @@ -492,7 +492,7 @@ class EntryRestControllerTest extends WallabagApiTestCase $this->assertEquals('New awesome title', $content['title']); $this->assertGreaterThan($nbTags, count($content['tags'])); $this->assertEquals(1, $content['user_id']); - $this->assertEquals('de_DE', $content['language']); + $this->assertEquals('de_AT', $content['language']); $this->assertEquals('http://preview.io/picture.jpg', $content['preview_picture']); $this->assertContains('sponge', $content['published_by']); $this->assertContains('bob', $content['published_by']); diff --git a/tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php b/tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php index bde0a6001..01decb23a 100644 --- a/tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php +++ b/tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php @@ -120,7 +120,7 @@ class ReadabilityControllerTest extends WallabagCoreTestCase $this->assertNotEmpty($content->getMimetype(), 'Mimetype for http://www.zataz.com is ok'); $this->assertNotEmpty($content->getPreviewPicture(), 'Preview picture for http://www.zataz.com is ok'); - $this->assertNotEmpty($content->getLanguage(), 'Language for http://www.zataz.com is ok'); + $this->assertEmpty($content->getLanguage(), 'Language for http://www.zataz.com is empty because not valid (fr-FR)'); $tags = $content->getTags(); $this->assertContains('foot', $tags, 'It includes the "foot" tag');