X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fostatus%2Factivity_representer_test.exs;h=0869f2fd509734abe149211a6b6e6e957155fc12;hb=b73a1a33de76dc848037a5d0e951866bd21f92c4;hp=bcf569395fce53109d188ef7ee774f46b03f45fb;hpb=540dfb4617aaab400d0aeafa47d41544c00a2b83;p=akkoma

diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs
index bcf569395..0869f2fd5 100644
--- a/test/web/ostatus/activity_representer_test.exs
+++ b/test/web/ostatus/activity_representer_test.exs
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
   use Pleroma.DataCase
 
@@ -7,6 +11,12 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
   alias Pleroma.Web.OStatus
 
   import Pleroma.Factory
+  import Tesla.Mock
+
+  setup do
+    mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
+    :ok
+  end
 
   test "an external note activity" do
     incoming = File.read!("test/fixtures/mastodon-note-cw.xml")
@@ -16,9 +26,12 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
 
     tuple = ActivityRepresenter.to_simple_form(activity, user)
 
-    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary()
 
-    assert String.contains?(res, ~s{<link type="text/html" href="https://mastodon.social/users/lambadalambda/updates/2314748" rel="alternate"/>})
+    assert String.contains?(
+             res,
+             ~s{<link type="text/html" href="https://mastodon.social/users/lambadalambda/updates/2314748" rel="alternate"/>}
+           )
   end
 
   test "a note activity" do
@@ -36,15 +49,17 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     <updated>#{note_activity.data["object"]["published"]}</updated>
     <ostatus:conversation ref="#{note_activity.data["context"]}">#{note_activity.data["context"]}</ostatus:conversation>
     <link ref="#{note_activity.data["context"]}" rel="ostatus:conversation" />
+    <summary>#{note_activity.data["object"]["summary"]}</summary>
     <link type="application/atom+xml" href="#{note_activity.data["object"]["id"]}" rel="self" />
     <link type="text/html" href="#{note_activity.data["object"]["id"]}" rel="alternate" />
     <category term="2hu"/>
     <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
+    <link name="2hu" rel="emoji" href="corndog.png" />
     """
 
     tuple = ActivityRepresenter.to_simple_form(note_activity, user)
 
-    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary()
 
     assert clean(res) == clean(expected)
   end
@@ -59,7 +74,10 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     answer = %{answer | data: data}
 
     note_object = Object.get_by_ap_id(note.data["object"]["id"])
-    Repo.update!(Object.change(note_object, %{ data: Map.put(note_object.data, "external_url", "someurl") }))
+
+    Repo.update!(
+      Object.change(note_object, %{data: Map.put(note_object.data, "external_url", "someurl")})
+    )
 
     user = User.get_cached_by_ap_id(answer.data["actor"])
 
@@ -73,16 +91,18 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     <updated>#{answer.data["object"]["published"]}</updated>
     <ostatus:conversation ref="#{answer.data["context"]}">#{answer.data["context"]}</ostatus:conversation>
     <link ref="#{answer.data["context"]}" rel="ostatus:conversation" />
+    <summary>2hu</summary>
     <link type="application/atom+xml" href="#{answer.data["object"]["id"]}" rel="self" />
     <link type="text/html" href="#{answer.data["object"]["id"]}" rel="alternate" />
     <category term="2hu"/>
     <thr:in-reply-to ref="#{note.data["object"]["id"]}" href="someurl" />
     <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
+    <link name="2hu" rel="emoji" href="corndog.png" />
     """
 
     tuple = ActivityRepresenter.to_simple_form(answer, user)
 
-    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary()
 
     assert clean(res) == clean(expected)
   end
@@ -92,15 +112,17 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     user = insert(:user)
     object = Object.get_cached_by_ap_id(note.data["object"]["id"])
 
-    {:ok, announce, object} = ActivityPub.announce(user, object)
+    {:ok, announce, _object} = ActivityPub.announce(user, object)
 
     announce = Repo.get(Activity, announce.id)
 
     note_user = User.get_cached_by_ap_id(note.data["actor"])
     note = Repo.get(Activity, note.id)
-    note_xml = ActivityRepresenter.to_simple_form(note, note_user, true)
-    |> :xmerl.export_simple_content(:xmerl_xml)
-    |> to_string
+
+    note_xml =
+      ActivityRepresenter.to_simple_form(note, note_user, true)
+      |> :xmerl.export_simple_content(:xmerl_xml)
+      |> to_string
 
     expected = """
     <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
@@ -116,12 +138,16 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     <activity:object>
       #{note_xml}
     </activity:object>
-    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{note.data["actor"]}"/>
+    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{
+      note.data["actor"]
+    }"/>
+    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
     """
 
-    announce_xml = ActivityRepresenter.to_simple_form(announce, user)
-    |> :xmerl.export_simple_content(:xmerl_xml)
-    |> to_string
+    announce_xml =
+      ActivityRepresenter.to_simple_form(announce, user)
+      |> :xmerl.export_simple_content(:xmerl_xml)
+      |> to_string
 
     assert clean(expected) == clean(announce_xml)
   end
@@ -134,7 +160,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     tuple = ActivityRepresenter.to_simple_form(like, user)
     refute is_nil(tuple)
 
-    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary()
 
     expected = """
     <activity:verb>http://activitystrea.ms/schema/1.0/favorite</activity:verb>
@@ -151,7 +177,10 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
     <link ref="#{like.data["context"]}" rel="ostatus:conversation" />
     <link rel="self" type="application/atom+xml" href="#{like.data["id"]}"/>
     <thr:in-reply-to ref="#{note.data["id"]}" />
-    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{note.data["actor"]}"/>
+    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{
+      note.data["actor"]
+    }"/>
+    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
     """
 
     assert clean(res) == clean(expected)
@@ -160,18 +189,20 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
   test "a follow activity" do
     follower = insert(:user)
     followed = insert(:user)
-    {:ok, activity} = ActivityPub.insert(%{
-          "type" => "Follow",
-          "actor" => follower.ap_id,
-          "object" => followed.ap_id,
-          "to" => [followed.ap_id]
-    })
+
+    {:ok, activity} =
+      ActivityPub.insert(%{
+        "type" => "Follow",
+        "actor" => follower.ap_id,
+        "object" => followed.ap_id,
+        "to" => [followed.ap_id]
+      })
 
     tuple = ActivityRepresenter.to_simple_form(activity, follower)
 
     refute is_nil(tuple)
 
-    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary()
 
     expected = """
     <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
@@ -187,7 +218,9 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
       <uri>#{activity.data["object"]}</uri>
     </activity:object>
     <link rel="self" type="application/atom+xml" href="#{activity.data["id"]}"/>
-    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{activity.data["object"]}"/>
+    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{
+      activity.data["object"]
+    }"/>
     """
 
     assert clean(res) == clean(expected)
@@ -203,7 +236,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
 
     refute is_nil(tuple)
 
-    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary()
 
     expected = """
     <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
@@ -219,7 +252,9 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
       <uri>#{followed.ap_id}</uri>
     </activity:object>
     <link rel="self" type="application/atom+xml" href="#{activity.data["id"]}"/>
-    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{followed.ap_id}"/>
+    <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{
+      followed.ap_id
+    }"/>
     """
 
     assert clean(res) == clean(expected)
@@ -227,13 +262,22 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
 
   test "a delete" do
     user = insert(:user)
-    activity = %Activity{data: %{ "id" => "ap_id", "type" => "Delete", "actor" => user.ap_id, "object" => "some_id", "published" => "2017-06-18T12:00:18+00:00" }}
+
+    activity = %Activity{
+      data: %{
+        "id" => "ap_id",
+        "type" => "Delete",
+        "actor" => user.ap_id,
+        "object" => "some_id",
+        "published" => "2017-06-18T12:00:18+00:00"
+      }
+    }
 
     tuple = ActivityRepresenter.to_simple_form(activity, nil)
 
     refute is_nil(tuple)
 
-    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+    res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary()
 
     expected = """
     <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>