X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fostatus%2Factivity_representer_test.exs;h=ed7fdc4322f1e25f881e175edb5ad057593a6068;hb=9223038319f0281f104fb9bb85c0cb8f6e52984a;hp=7179cfb710155d6120baa74d963dc6d20a93f3a1;hpb=8e02fa100f9f207253a35fbfd92e6e8f9b585435;p=akkoma
diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs
index 7179cfb71..ed7fdc432 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,13 +32,16 @@ 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["context"]}
-
+ #{note_activity.data["object"]["published"]}
+ #{note_activity.data["object"]["published"]}
+ #{note_activity.data["context"]}
+
+ #{note_activity.data["object"]["summary"]}
+
+
"""
tuple = ActivityRepresenter.to_simple_form(note_activity, user)
@@ -47,10 +60,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"])
@@ -60,13 +71,17 @@ 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["context"]}
-
+ #{answer.data["object"]["published"]}
+ #{answer.data["object"]["published"]}
+ #{answer.data["context"]}
+
+ 2hu
-
+
+
+
+
"""
tuple = ActivityRepresenter.to_simple_form(answer, user)
@@ -91,21 +106,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["context"]}
-
+ #{announce.data["published"]}
+ #{announce.data["published"]}
+ #{announce.data["context"]}
+
#{note_xml}
@@ -125,12 +135,6 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
user = insert(:user)
{:ok, like, _note} = ActivityPub.like(user, note)
- # TODO: Are these the correct dates?
- 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)
@@ -141,14 +145,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"]}
-
+ #{like.data["context"]}
+
@@ -167,13 +171,6 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
"to" => [followed.ap_id]
})
-
- # TODO: Are these the correct dates?
- updated_at = activity.updated_at
- |> NaiveDateTime.to_iso8601
- inserted_at = activity.inserted_at
- |> NaiveDateTime.to_iso8601
-
tuple = ActivityRepresenter.to_simple_form(activity, follower)
refute is_nil(tuple)
@@ -186,8 +183,8 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
#{activity.data["id"]}
#{follower.nickname} started following #{activity.data["object"]}
#{follower.nickname} started following #{activity.data["object"]}
- #{inserted_at}
- #{updated_at}
+ #{activity.data["published"]}
+ #{activity.data["published"]}
http://activitystrea.ms/schema/1.0/person
#{activity.data["object"]}
@@ -206,12 +203,6 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
{:ok, _activity} = ActivityPub.follow(follower, followed)
{:ok, activity} = ActivityPub.unfollow(follower, followed)
- # TODO: Are these the correct dates?
- updated_at = activity.updated_at
- |> NaiveDateTime.to_iso8601
- inserted_at = activity.inserted_at
- |> NaiveDateTime.to_iso8601
-
tuple = ActivityRepresenter.to_simple_form(activity, follower)
refute is_nil(tuple)
@@ -224,8 +215,8 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
#{activity.data["id"]}
#{follower.nickname} stopped following #{followed.ap_id}
#{follower.nickname} stopped following #{followed.ap_id}
- #{inserted_at}
- #{updated_at}
+ #{activity.data["published"]}
+ #{activity.data["published"]}
http://activitystrea.ms/schema/1.0/person
#{followed.ap_id}
@@ -238,6 +229,29 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
assert clean(res) == clean(expected)
end
+ 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" }}
+
+ tuple = ActivityRepresenter.to_simple_form(activity, nil)
+
+ 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/delete
+ #{activity.data["object"]}
+ An object was deleted
+ An object was deleted
+ #{activity.data["published"]}
+ #{activity.data["published"]}
+ """
+
+ assert clean(res) == clean(expected)
+ end
+
test "an unknown activity" do
tuple = ActivityRepresenter.to_simple_form(%Activity{}, nil)
assert is_nil(tuple)