From 3be96dcb173f8087009558ba9f6408dc8d0164f9 Mon Sep 17 00:00:00 2001 From: Floran Brutel Date: Thu, 29 Mar 2018 22:58:40 +0200 Subject: Use https instead of http for bild.de to fix tests --- tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php index 12788366..30d16f2c 100644 --- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php @@ -1314,7 +1314,7 @@ class EntryControllerTest extends WallabagCoreTestCase 'fr_FR', ], 'de' => [ - 'http://www.bild.de/politik/ausland/theresa-may/wahlbeben-grossbritannien-analyse-52108924.bild.html', + 'https://www.bild.de/politik/ausland/theresa-may/wahlbeben-grossbritannien-analyse-52108924.bild.html', 'de', ], 'it' => [ -- cgit v1.2.3 From 739a4024fa64ba5412078e01c8ae84628f865f26 Mon Sep 17 00:00:00 2001 From: Floran Brutel Date: Fri, 30 Mar 2018 23:09:03 +0200 Subject: Replace zataz url --- tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php | 6 +++--- .../ImportBundle/Controller/ReadabilityControllerTest.php | 8 ++++---- tests/Wallabag/ImportBundle/fixtures/readability.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php index 30d16f2c..95482fe4 100644 --- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php @@ -1309,9 +1309,9 @@ class EntryControllerTest extends WallabagCoreTestCase 'https://www.pravda.ru/world/09-06-2017/1337283-qatar-0/', 'ru', ], - 'fr-FR' => [ - 'https://www.zataz.com/90-des-dossiers-medicaux-des-coreens-du-sud-vendus-a-des-entreprises-privees/', - 'fr_FR', + 'fr' => [ + 'https://fr.wikipedia.org/wiki/Wallabag', + 'fr', ], 'de' => [ 'https://www.bild.de/politik/ausland/theresa-may/wahlbeben-grossbritannien-analyse-52108924.bild.html', diff --git a/tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php b/tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php index fcb9dfab..78816ad8 100644 --- a/tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php +++ b/tests/Wallabag/ImportBundle/Controller/ReadabilityControllerTest.php @@ -111,7 +111,7 @@ class ReadabilityControllerTest extends WallabagCoreTestCase ->get('doctrine.orm.entity_manager') ->getRepository('WallabagCoreBundle:Entry') ->findByUrlAndUserId( - 'https://www.zataz.com/90-des-dossiers-medicaux-des-coreens-du-sud-vendus-a-des-entreprises-privees/', + 'https://www.20minutes.fr/bordeaux/2120479-20170823-bordeaux-poche-chocolatine-association-traduit-etudiants-etrangers-mots-sud-ouest', $this->getLoggedInUserId() ); @@ -119,9 +119,9 @@ class ReadabilityControllerTest extends WallabagCoreTestCase $this->assertContains('flashes.import.notice.summary', $body[0]); $this->assertInstanceOf('Wallabag\CoreBundle\Entity\Entry', $content); - $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->assertNotEmpty($content->getMimetype(), 'Mimetype for https://www.20minutes.fr is ok'); + $this->assertNotEmpty($content->getPreviewPicture(), 'Preview picture for https://www.20minutes.fr is ok'); + $this->assertNotEmpty($content->getLanguage(), 'Language for https://www.20minutes.fr is ok'); $tags = $content->getTags(); $this->assertContains('foot', $tags, 'It includes the "foot" tag'); diff --git a/tests/Wallabag/ImportBundle/fixtures/readability.json b/tests/Wallabag/ImportBundle/fixtures/readability.json index ba7be5bf..f71b8d19 100644 --- a/tests/Wallabag/ImportBundle/fixtures/readability.json +++ b/tests/Wallabag/ImportBundle/fixtures/readability.json @@ -21,8 +21,8 @@ "archive": 0, "date_added": "2016-09-08T11:55:58+0200", "favorite": 0, - "article__title": "90% des dossiers médicaux des Coréens du sud vendus à des entreprises privées - ZATAZ", - "article__url": "https://www.zataz.com/90-des-dossiers-medicaux-des-coreens-du-sud-vendus-a-des-entreprises-privees/" + "article__title": "Bordeaux: Poche, chocolatine… Une association traduit aux étudiants étrangers les mots du Sud-Ouest", + "article__url": "https://www.20minutes.fr/bordeaux/2120479-20170823-bordeaux-poche-chocolatine-association-traduit-etudiants-etrangers-mots-sud-ouest" } ], "recommendations": [] -- cgit v1.2.3 From 80d4260a8e481861ef13de661e8770b86be6ad78 Mon Sep 17 00:00:00 2001 From: Floran Brutel Date: Sat, 31 Mar 2018 12:55:27 +0200 Subject: Fix CS in UtilsTest.php --- tests/Wallabag/CoreBundle/Tools/UtilsTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Wallabag/CoreBundle/Tools/UtilsTest.php b/tests/Wallabag/CoreBundle/Tools/UtilsTest.php index 347589dc..952d076d 100644 --- a/tests/Wallabag/CoreBundle/Tools/UtilsTest.php +++ b/tests/Wallabag/CoreBundle/Tools/UtilsTest.php @@ -13,7 +13,7 @@ class UtilsTest extends TestCase */ public function testCorrectWordsCountForDifferentLanguages($text, $expectedCount) { - static::assertEquals((float) $expectedCount, Utils::getReadingTime($text)); + static::assertSame((float) $expectedCount, Utils::getReadingTime($text)); } public function examples() -- cgit v1.2.3