X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fostatus%2Factivity_representer_test.exs;h=a4bb68c4d9722aa82428b4770227160a34e33b56;hb=180b87257cae481d4d9ffc9f03a06268ad8df569;hp=b9fa4ccfb583fe4226d67cd4e915f2cf2db386ba;hpb=cdcb201bf5d146967f84df9bcf6eff97b0cb575a;p=akkoma diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs index b9fa4ccfb..a4bb68c4d 100644 --- a/test/web/ostatus/activity_representer_test.exs +++ b/test/web/ostatus/activity_representer_test.exs @@ -1,11 +1,40 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2018 Pleroma Authors +# SPDX-License-Identifier: AGPL-3.0-only + defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do use Pleroma.DataCase - alias Pleroma.Web.OStatus.ActivityRepresenter - alias Pleroma.{User, Activity, Object} + alias Pleroma.Activity + alias Pleroma.Object + alias Pleroma.User alias Pleroma.Web.ActivityPub.ActivityPub + alias Pleroma.Web.OStatus + alias Pleroma.Web.OStatus.ActivityRepresenter 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") + {: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) @@ -20,16 +49,19 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do #{note_activity.data["object"]["content"]} #{note_activity.data["object"]["published"]} #{note_activity.data["object"]["published"]} - #{note_activity.data["context"]} + #{note_activity.data["context"]} + #{note_activity.data["object"]["summary"]} + + """ 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 @@ -43,6 +75,12 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do data = %{answer.data | "object" => object} 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")}) + ) + user = User.get_cached_by_ap_id(answer.data["actor"]) expected = """ @@ -53,17 +91,20 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do #{answer.data["object"]["content"]} #{answer.data["object"]["published"]} #{answer.data["object"]["published"]} - #{answer.data["context"]} + #{answer.data["context"]} + 2hu + - + + """ 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 @@ -73,15 +114,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) + announce = Activity.get_by_id(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 = Activity.get_by_id(note.id) + + note_xml = + ActivityRepresenter.to_simple_form(note, note_user, true) + |> :xmerl.export_simple_content(:xmerl_xml) + |> to_string expected = """ http://activitystrea.ms/schema/1.0/activity @@ -91,18 +134,22 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do RT #{note.data["object"]["content"]} #{announce.data["published"]} #{announce.data["published"]} - #{announce.data["context"]} + #{announce.data["context"]} #{note_xml} - + + """ - 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 @@ -115,7 +162,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 = """ http://activitystrea.ms/schema/1.0/favorite @@ -128,11 +175,14 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do http://activitystrea.ms/schema/1.0/note #{note.data["id"]} - #{like.data["context"]} + #{like.data["context"]} - + + """ assert clean(res) == clean(expected) @@ -141,18 +191,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 = """ http://activitystrea.ms/schema/1.0/activity @@ -168,7 +220,9 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do #{activity.data["object"]} - + """ assert clean(res) == clean(expected) @@ -184,7 +238,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 = """ http://activitystrea.ms/schema/1.0/activity @@ -200,7 +254,41 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do #{followed.ap_id} - + + """ + + 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)