Fix merge conflict

1 files changed, 41 insertions, 0 deletions

diff --git a/test/web/rich_media/parser_test.exs b/test/web/rich_media/parser_test.exs
index ff3486a6d..e14b5061a 100644
--- a/test/web/rich_media/parser_test.exs
+++ b/test/web/rich_media/parser_test.exs
@@ -15,6 +15,18 @@ defmodule Pleroma.Web.RichMedia.ParserTest do
       } ->
         %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/twitter_card.html")}
 
+      %{
+        method: :get,
+        url: "http://example.com/oembed"
+      } ->
+        %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/oembed.html")}
+
+      %{
+        method: :get,
+        url: "http://example.com/oembed.json"
+      } ->
+        %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/oembed.json")}
+
       %{method: :get, url: "http://example.com/empty"} ->
         %Tesla.Env{status: 200, body: "hello"}
     end)
@@ -48,4 +60,33 @@ defmodule Pleroma.Web.RichMedia.ParserTest do
                 description: "View the album on Flickr."
               }}
   end
+
+  test "parses OEmbed" do
+    assert Pleroma.Web.RichMedia.Parser.parse("http://example.com/oembed") ==
+             {:ok,
+              %{
+                "author_name" => "‮‭‬bees‬",
+                "author_url" => "https://www.flickr.com/photos/bees/",
+                "cache_age" => 3600,
+                "flickr_type" => "photo",
+                "height" => "768",
+                "html" =>
+                  "<a data-flickr-embed=\"true\" href=\"https://www.flickr.com/photos/bees/2362225867/\" title=\"Bacon Lollys by ‮‭‬bees‬, on Flickr\"><img src=\"https://farm4.staticflickr.com/3040/2362225867_4a87ab8baf_b.jpg\" width=\"1024\" height=\"768\" alt=\"Bacon Lollys\"></a><script async src=\"https://embedr.flickr.com/assets/client-code.js\" charset=\"utf-8\"></script>",
+                "license" => "All Rights Reserved",
+                "license_id" => 0,
+                "provider_name" => "Flickr",
+                "provider_url" => "https://www.flickr.com/",
+                "thumbnail_height" => 150,
+                "thumbnail_url" =>
+                  "https://farm4.staticflickr.com/3040/2362225867_4a87ab8baf_q.jpg",
+                "thumbnail_width" => 150,
+                "title" => "Bacon Lollys",
+                "type" => "photo",
+                "url" => "https://farm4.staticflickr.com/3040/2362225867_4a87ab8baf_b.jpg",
+                "version" => "1.0",
+                "web_page" => "https://www.flickr.com/photos/bees/2362225867/",
+                "web_page_short_url" => "https://flic.kr/p/4AK2sc",
+                "width" => "1024"
+              }}
+  end
 end