Fix tests after rebase

diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
index 59465ad1190d6f6625d844829f9faab8115de19c..c6fa0d983ee3321436520e6a198b7741068465be 100644 (file)
--- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php
+++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
@@ -299,8 +299,6 @@ class ContentProxy
         // if content is an image, define it as a preview too
         if (!empty($content['headers']['content-type']) && \in_array($this->mimeGuesser->guess($content['headers']['content-type']), ['jpeg', 'jpg', 'gif', 'png'], true)) {
             $previewPictureUrl = $content['url'];
-
-            $entry->setMimetype($content['headers']['content-type']);
         } elseif (empty($previewPictureUrl)) {
             $this->logger->debug('Extracting images from content to provide a default preview picture');
             $imagesUrls = DownloadImages::extractImagesUrlsFromHtml($content['html']);
@@ -311,6 +309,10 @@ class ContentProxy
             }
         }
 
+        if (!empty($content['headers']['content-type'])) {
+            $entry->setMimetype($content['headers']['content-type']);
+        }
+
         if (!empty($previewPictureUrl)) {
             $this->updatePreviewPicture($entry, $previewPictureUrl);
         }

diff --git a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
index c123e7e61b647b1e5abde2a8de34b6d3a46e764b..9ce72c79c1277ec08ded6eb7f3d8b4265cc4fdf7 100644 (file)
--- a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
@@ -232,14 +232,12 @@ class ContentProxyTest extends TestCase
                 'html' => "<h1>Test</h1><p><img src='http://3.3.3.3/cover.jpg'/></p>",
                 'title' => 'this is my title',
                 'url' => 'http://1.1.1.1',
-                'content_type' => 'text/html',
+                'headers' => [
+                    'content-type' => 'text/html',
+                ],
                 'language' => 'fr',
                 'status' => '200',
-                'open_graph' => [
-                    'og_title' => 'my OG title',
-                    'og_description' => 'OG desc',
-                    'og_image' => null,
-                ],
+                'image' => null,
             ]);
 
         $proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
@@ -274,14 +272,12 @@ class ContentProxyTest extends TestCase
                 'html' => "<h1>Test</h1><p><img src='http://3.3.3.3/nevermind.jpg'/></p>",
                 'title' => 'this is my title',
                 'url' => 'http://1.1.1.1',
-                'content_type' => 'text/html',
+                'headers' => [
+                    'content-type' => 'text/html',
+                ],
                 'language' => 'fr',
                 'status' => '200',
-                'open_graph' => [
-                    'og_title' => 'my OG title',
-                    'og_description' => 'OG desc',
-                    'og_image' => 'http://3.3.3.3/cover.jpg',
-                ],
+                'image' => 'http://3.3.3.3/cover.jpg',
             ]);
 
         $proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);