tec: Handle feeds served as text/html

flusio · Mar 18, 2024 · 7497ef2 · 7497ef2
1 parent 441053a
commit 7497ef2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/lib/SpiderBits/src/feeds/Feed.php b/lib/SpiderBits/src/feeds/Feed.php
@@ -100,6 +100,7 @@ public static function isFeedContentType(string $content_type): bool
             str_contains($content_type, 'application/json') ||
             str_contains($content_type, 'application/rdf+xml') ||
             str_contains($content_type, 'application/xml') ||
+            str_contains($content_type, 'text/html') ||
             str_contains($content_type, 'text/rss+xml') ||
             str_contains($content_type, 'text/xml') ||
             str_contains($content_type, 'text/plain')

diff --git a/tests/cli/FeedsTest.php b/tests/cli/FeedsTest.php
@@ -120,7 +120,7 @@ public function testAddCreatesCollectionButFailsIfNotAFeed(): void
         ]);
 
         $this->assertResponseCode($response, 400);
-        $this->assertResponseContains($response, 'Invalid content type: text/html');
+        $this->assertResponseContains($response, 'Can’t parse the given string');
         $this->assertSame(1, models\Collection::count());
         $this->assertSame(0, models\Link::count());
         $collection = models\Collection::take();
@@ -129,7 +129,7 @@ public function testAddCreatesCollectionButFailsIfNotAFeed(): void
         $this->assertSame('https://flus.fr/carnet/', $collection->feed_url);
         $this->assertSame(200, $collection->feed_fetched_code);
         $this->assertNotNull($collection->feed_fetched_error);
-        $this->assertStringContainsString('Invalid content type: text/html', $collection->feed_fetched_error);
+        $this->assertStringContainsString('Can’t parse the given string', $collection->feed_fetched_error);
     }
 
     public function testAddCreatesCollectionButFailsIfUrlIsNotSuccessful(): void

diff --git a/tests/lib/SpiderBits/feeds/FeedTest.php b/tests/lib/SpiderBits/feeds/FeedTest.php
@@ -457,6 +457,7 @@ public static function validContentType(): array
             ['application/json'],
             ['application/rdf+xml'],
             ['application/xml'],
+            ['text/html'],
             ['text/rss+xml'],
             ['text/xml'],
             ['text/plain'],
@@ -471,7 +472,7 @@ public static function invalidContentType(): array
         return [
             [''],
             ['some text'],
-            ['text/html'],
+            ['text/csv'],
         ];
     }
 }