diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-10-04 21:29:01 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-10-04 21:29:01 +0000 |
| commit | 923dff21b3feeecd17752005f7f7a97862a92e00 (patch) | |
| tree | 8f5bf9051cfff9e8d5e0b1f3bd61b5354bf456fe /test | |
| parent | 4d38e4855820786bfa1dc7fc58d7ff78728e3ab6 (diff) | |
| parent | 0f1486ed4eeeff6a873f6050ea5fae0fdcc1c655 (diff) | |
| download | pleroma-923dff21b3feeecd17752005f7f7a97862a92e00.tar.gz | |
Merge branch 'backport/undo-fixes' into 'maint/1.1'
backport: undo fixes
See merge request pleroma/pleroma!1789
Diffstat (limited to 'test')
| -rw-r--r-- | test/web/activity_pub/activity_pub_test.exs | 5 | ||||
| -rw-r--r-- | test/web/activity_pub/utils_test.exs | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs index ed6f20105..fecbf5353 100644 --- a/test/web/activity_pub/activity_pub_test.exs +++ b/test/web/activity_pub/activity_pub_test.exs @@ -760,10 +760,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do {:ok, like_activity, object} = ActivityPub.like(user, object) assert object.data["like_count"] == 1 - {:ok, _, _, object} = ActivityPub.unlike(user, object) + {:ok, unlike_activity, _, object} = ActivityPub.unlike(user, object) assert object.data["like_count"] == 0 assert Activity.get_by_id(like_activity.id) == nil + assert note_activity.actor in unlike_activity.recipients end end @@ -806,7 +807,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do assert unannounce_activity.data["to"] == [ User.ap_followers(user), - announce_activity.data["actor"] + object.data["actor"] ] assert unannounce_activity.data["type"] == "Undo" diff --git a/test/web/activity_pub/utils_test.exs b/test/web/activity_pub/utils_test.exs index eb429b2c4..db6c68c44 100644 --- a/test/web/activity_pub/utils_test.exs +++ b/test/web/activity_pub/utils_test.exs @@ -94,11 +94,13 @@ defmodule Pleroma.Web.ActivityPub.UtilsTest do user = insert(:user) like_activity = insert(:like_activity, data_attrs: %{"context" => "test context"}) + object = Object.normalize(like_activity.data["object"]) + assert Utils.make_unlike_data(user, like_activity, nil) == %{ "type" => "Undo", "actor" => user.ap_id, "object" => like_activity.data, - "to" => [user.follower_address, like_activity.data["actor"]], + "to" => [user.follower_address, object.data["actor"]], "cc" => [Pleroma.Constants.as_public()], "context" => like_activity.data["context"] } @@ -107,7 +109,7 @@ defmodule Pleroma.Web.ActivityPub.UtilsTest do "type" => "Undo", "actor" => user.ap_id, "object" => like_activity.data, - "to" => [user.follower_address, like_activity.data["actor"]], + "to" => [user.follower_address, object.data["actor"]], "cc" => [Pleroma.Constants.as_public()], "context" => like_activity.data["context"], "id" => "9mJEZK0tky1w2xD2vY" |