From c5c3ad90d00f1ea599e489aa03cfecada44c998c Mon Sep 17 00:00:00 2001 From: raeno Date: Fri, 14 Dec 2018 02:59:33 +0100 Subject: [PATCH] Fix tests. Remove oembed template --- .../web/templates/o_embed/note.xml.eex | 10 --------- test/web/ostatus/ostatus_controller_test.exs | 21 +++++++++++++++++-- 2 files changed, 19 insertions(+), 12 deletions(-) delete mode 100644 lib/pleroma/web/templates/o_embed/note.xml.eex diff --git a/lib/pleroma/web/templates/o_embed/note.xml.eex b/lib/pleroma/web/templates/o_embed/note.xml.eex deleted file mode 100644 index e814a4cb3..000000000 --- a/lib/pleroma/web/templates/o_embed/note.xml.eex +++ /dev/null @@ -1,10 +0,0 @@ - - - 1.0 - link - raeno - http://iamcal.com/ - 86400 - iamcal.com - http://iamcal.com/ - \ No newline at end of file diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs index 560305c15..747e30154 100644 --- a/test/web/ostatus/ostatus_controller_test.exs +++ b/test/web/ostatus/ostatus_controller_test.exs @@ -84,6 +84,7 @@ test "gets an object", %{conn: conn} do conn = conn + |> put_req_header("accept", "application/xml") |> get(url) expected = @@ -110,11 +111,12 @@ test "404s on nonexisting objects", %{conn: conn} do |> response(404) end - test "gets an activity", %{conn: conn} do + test "gets an activity in xml format", %{conn: conn} do note_activity = insert(:note_activity) [_, uuid] = hd(Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["id"])) conn + |> put_req_header("accept", "application/xml") |> get("/activities/#{uuid}") |> response(200) end @@ -134,7 +136,22 @@ test "404s on nonexistent activities", %{conn: conn} do |> response(404) end - test "gets a notice", %{conn: conn} do + test "renders notice metatags in html format" do + note_activity = insert(:note_activity) + + conn = get(conn, "/notice/#{note_activity.id}") + + twitter_card_summary = "" + + description_content = + "" + + body = html_response(conn, 200) + assert body =~ twitter_card_summary + assert body =~ description_content + end + + test "gets a notice in xml format", %{conn: conn} do note_activity = insert(:note_activity) conn