diff options
Diffstat (limited to 'test/web')
| -rw-r--r-- | test/web/activity_pub/activity_pub_test.exs | 46 | ||||
| -rw-r--r-- | test/web/activity_pub/side_effects_test.exs | 26 | ||||
| -rw-r--r-- | test/web/activity_pub/transmogrifier/undo_handling_test.exs | 5 | 
3 files changed, 25 insertions, 52 deletions
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs index cb2d41f0b..2c3d354f2 100644 --- a/test/web/activity_pub/activity_pub_test.exs +++ b/test/web/activity_pub/activity_pub_test.exs @@ -1008,52 +1008,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do      end    end -  describe "unannouncing an object" do -    test "unannouncing a previously announced object" do -      note_activity = insert(:note_activity) -      object = Object.normalize(note_activity) -      user = insert(:user) - -      # Unannouncing an object that is not announced does nothing -      {:ok, object} = ActivityPub.unannounce(user, object) -      refute object.data["announcement_count"] - -      {:ok, announce_activity, object} = ActivityPub.announce(user, object) -      assert object.data["announcement_count"] == 1 - -      {:ok, unannounce_activity, object} = ActivityPub.unannounce(user, object) -      assert object.data["announcement_count"] == 0 - -      assert unannounce_activity.data["to"] == [ -               User.ap_followers(user), -               object.data["actor"] -             ] - -      assert unannounce_activity.data["type"] == "Undo" -      assert unannounce_activity.data["object"] == announce_activity.data -      assert unannounce_activity.data["actor"] == user.ap_id -      assert unannounce_activity.data["context"] == announce_activity.data["context"] - -      assert Activity.get_by_id(announce_activity.id) == nil -    end - -    test "reverts unannouncing on error" do -      note_activity = insert(:note_activity) -      object = Object.normalize(note_activity) -      user = insert(:user) - -      {:ok, _announce_activity, object} = ActivityPub.announce(user, object) -      assert object.data["announcement_count"] == 1 - -      with_mock(Utils, [:passthrough], maybe_federate: fn _ -> {:error, :reverted} end) do -        assert {:error, :reverted} = ActivityPub.unannounce(user, object) -      end - -      object = Object.get_by_ap_id(object.data["id"]) -      assert object.data["announcement_count"] == 1 -    end -  end -    describe "uploading files" do      test "copies the file to the configured folder" do        file = %Plug.Upload{ diff --git a/test/web/activity_pub/side_effects_test.exs b/test/web/activity_pub/side_effects_test.exs index abcfdfa2f..00241320b 100644 --- a/test/web/activity_pub/side_effects_test.exs +++ b/test/web/activity_pub/side_effects_test.exs @@ -22,8 +22,8 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do        user = insert(:user)        {:ok, post} = CommonAPI.post(poster, %{"status" => "hey"})        {:ok, like} = CommonAPI.favorite(user, post.id) -        {:ok, reaction, _} = CommonAPI.react_with_emoji(post.id, user, "👍") +      {:ok, announce, _} = CommonAPI.repeat(post.id, user)        {:ok, undo_data, _meta} = Builder.undo(user, like)        {:ok, like_undo, _meta} = ActivityPub.persist(undo_data, local: true) @@ -31,15 +31,37 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do        {:ok, undo_data, _meta} = Builder.undo(user, reaction)        {:ok, reaction_undo, _meta} = ActivityPub.persist(undo_data, local: true) +      {:ok, undo_data, _meta} = Builder.undo(user, announce) +      {:ok, announce_undo, _meta} = ActivityPub.persist(undo_data, local: true) +        %{          like_undo: like_undo,          post: post,          like: like,          reaction_undo: reaction_undo, -        reaction: reaction +        reaction: reaction, +        announce_undo: announce_undo, +        announce: announce        }      end +    test "an announce undo removes the announce from the object", %{ +      announce_undo: announce_undo, +      post: post +    } do +      {:ok, _announce_undo, _} = SideEffects.handle(announce_undo) + +      object = Object.get_by_ap_id(post.data["object"]) + +      assert object.data["announcement_count"] == 0 +      assert object.data["announcements"] == [] +    end + +    test "deletes the original announce", %{announce_undo: announce_undo, announce: announce} do +      {:ok, _announce_undo, _} = SideEffects.handle(announce_undo) +      refute Activity.get_by_id(announce.id) +    end +      test "a reaction undo removes the reaction from the object", %{        reaction_undo: reaction_undo,        post: post diff --git a/test/web/activity_pub/transmogrifier/undo_handling_test.exs b/test/web/activity_pub/transmogrifier/undo_handling_test.exs index bf2a6bc5b..281cf5b0d 100644 --- a/test/web/activity_pub/transmogrifier/undo_handling_test.exs +++ b/test/web/activity_pub/transmogrifier/undo_handling_test.exs @@ -125,11 +125,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.UndoHandlingTest do      {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)      assert data["type"] == "Undo" -    assert object_data = data["object"] -    assert object_data["type"] == "Announce" -    assert object_data["object"] == activity.data["object"] -    assert object_data["id"] == +    assert data["object"] ==               "http://mastodon.example.org/users/admin/statuses/99542391527669785/activity"    end  | 
