X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fostatus%2Factivity_representer_test.exs;h=0129e375855625fb72ffd668823a50cf3837167e;hb=763756f8790809d593c34dc78196d241d230658a;hp=12c9bbaa25d3b40718fe599968c464d8bdb7a174;hpb=1077c5c58d13325cd61893c609cad6505ad1d32e;p=akkoma
diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs
index 12c9bbaa2..0129e3758 100644
--- a/test/web/ostatus/activity_representer_test.exs
+++ b/test/web/ostatus/activity_representer_test.exs
@@ -4,15 +4,25 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
alias Pleroma.Web.OStatus.ActivityRepresenter
alias Pleroma.{User, Activity, Object}
alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.OStatus
import Pleroma.Factory
+ test "an external note activity" do
+ incoming = File.read!("test/fixtures/mastodon-note-cw.xml")
+ {:ok, [activity]} = OStatus.handle_incoming(incoming)
+
+ user = User.get_cached_by_ap_id(activity.data["actor"])
+
+ tuple = ActivityRepresenter.to_simple_form(activity, user)
+
+ res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+
+ assert String.contains?(res, ~s{})
+ end
+
test "a note activity" do
note_activity = insert(:note_activity)
- updated_at = note_activity.updated_at
- |> NaiveDateTime.to_iso8601
- inserted_at = note_activity.inserted_at
- |> NaiveDateTime.to_iso8601
user = User.get_cached_by_ap_id(note_activity.data["actor"])
@@ -22,11 +32,13 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
#{note_activity.data["object"]["id"]}
New note by #{user.nickname}
#{note_activity.data["object"]["content"]}
- #{inserted_at}
- #{updated_at}
+ #{note_activity.data["object"]["published"]}
+ #{note_activity.data["object"]["published"]}
#{note_activity.data["context"]}
-
+
+
+
"""
@@ -46,10 +58,8 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
data = %{answer.data | "object" => object}
answer = %{answer | data: data}
- updated_at = answer.updated_at
- |> NaiveDateTime.to_iso8601
- inserted_at = answer.inserted_at
- |> NaiveDateTime.to_iso8601
+ 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") }))
user = User.get_cached_by_ap_id(answer.data["actor"])
@@ -59,12 +69,14 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
#{answer.data["object"]["id"]}
New note by #{user.nickname}
#{answer.data["object"]["content"]}
- #{inserted_at}
- #{updated_at}
+ #{answer.data["object"]["published"]}
+ #{answer.data["object"]["published"]}
#{answer.data["context"]}
-
+
-
+
+
+
"""
@@ -90,21 +102,16 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
|> :xmerl.export_simple_content(:xmerl_xml)
|> to_string
- updated_at = announce.updated_at
- |> NaiveDateTime.to_iso8601
- inserted_at = announce.inserted_at
- |> NaiveDateTime.to_iso8601
-
expected = """
http://activitystrea.ms/schema/1.0/activity
http://activitystrea.ms/schema/1.0/share
#{announce.data["id"]}
#{user.nickname} repeated a notice
RT #{note.data["object"]["content"]}
- #{inserted_at}
- #{updated_at}
+ #{announce.data["published"]}
+ #{announce.data["published"]}
#{announce.data["context"]}
-
+
#{note_xml}
@@ -124,11 +131,6 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
user = insert(:user)
{:ok, like, _note} = ActivityPub.like(user, note)
- updated_at = like.updated_at
- |> NaiveDateTime.to_iso8601
- inserted_at = like.inserted_at
- |> NaiveDateTime.to_iso8601
-
tuple = ActivityRepresenter.to_simple_form(like, user)
refute is_nil(tuple)
@@ -139,14 +141,14 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
#{like.data["id"]}
New favorite by #{user.nickname}
#{user.nickname} favorited something
- #{inserted_at}
- #{updated_at}
+ #{like.data["published"]}
+ #{like.data["published"]}
http://activitystrea.ms/schema/1.0/note
#{note.data["id"]}
#{like.data["context"]}
-
+
@@ -155,6 +157,74 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
assert clean(res) == clean(expected)
end
+ 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]
+ })
+
+ tuple = ActivityRepresenter.to_simple_form(activity, follower)
+
+ refute is_nil(tuple)
+
+ res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+
+ expected = """
+ http://activitystrea.ms/schema/1.0/activity
+ http://activitystrea.ms/schema/1.0/follow
+ #{activity.data["id"]}
+ #{follower.nickname} started following #{activity.data["object"]}
+ #{follower.nickname} started following #{activity.data["object"]}
+ #{activity.data["published"]}
+ #{activity.data["published"]}
+
+ http://activitystrea.ms/schema/1.0/person
+ #{activity.data["object"]}
+ #{activity.data["object"]}
+
+
+
+ """
+
+ assert clean(res) == clean(expected)
+ end
+
+ test "an unfollow activity" do
+ follower = insert(:user)
+ followed = insert(:user)
+ {:ok, _activity} = ActivityPub.follow(follower, followed)
+ {:ok, activity} = ActivityPub.unfollow(follower, followed)
+
+ tuple = ActivityRepresenter.to_simple_form(activity, follower)
+
+ refute is_nil(tuple)
+
+ res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
+
+ expected = """
+ http://activitystrea.ms/schema/1.0/activity
+ http://activitystrea.ms/schema/1.0/unfollow
+ #{activity.data["id"]}
+ #{follower.nickname} stopped following #{followed.ap_id}
+ #{follower.nickname} stopped following #{followed.ap_id}
+ #{activity.data["published"]}
+ #{activity.data["published"]}
+
+ http://activitystrea.ms/schema/1.0/person
+ #{followed.ap_id}
+ #{followed.ap_id}
+
+
+
+ """
+
+ assert clean(res) == clean(expected)
+ end
+
test "an unknown activity" do
tuple = ActivityRepresenter.to_simple_form(%Activity{}, nil)
assert is_nil(tuple)