projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into issue/1276
[akkoma]
/
test
/
web
/
activity_pub
/
utils_test.exs
diff --git
a/test/web/activity_pub/utils_test.exs
b/test/web/activity_pub/utils_test.exs
index b1c1d6f716a6ef4c9ec073b3a0f75c1d7c9ad1db..586eb1d2f902bf11b83e9be7d2d2af942f68aa5d 100644
(file)
--- a/
test/web/activity_pub/utils_test.exs
+++ b/
test/web/activity_pub/utils_test.exs
@@
-10,6
+10,7
@@
defmodule Pleroma.Web.ActivityPub.UtilsTest do
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Utils
+ alias Pleroma.Web.AdminAPI.AccountView
alias Pleroma.Web.CommonAPI
import Pleroma.Factory
alias Pleroma.Web.CommonAPI
import Pleroma.Factory
@@
-106,11
+107,13
@@
defmodule Pleroma.Web.ActivityPub.UtilsTest do
user = insert(:user)
like_activity = insert(:like_activity, data_attrs: %{"context" => "test context"})
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,
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"]
}
"cc" => [Pleroma.Constants.as_public()],
"context" => like_activity.data["context"]
}
@@
-119,7
+122,7
@@
defmodule Pleroma.Web.ActivityPub.UtilsTest do
"type" => "Undo",
"actor" => user.ap_id,
"object" => like_activity.data,
"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"
"cc" => [Pleroma.Constants.as_public()],
"context" => like_activity.data["context"],
"id" => "9mJEZK0tky1w2xD2vY"
@@
-295,7
+298,7
@@
defmodule Pleroma.Web.ActivityPub.UtilsTest do
describe "update_follow_state_for_all/2" do
test "updates the state of all Follow activities with the same actor and object" do
describe "update_follow_state_for_all/2" do
test "updates the state of all Follow activities with the same actor and object" do
- user = insert(:user,
info: %{locked: true}
)
+ user = insert(:user,
locked: true
)
follower = insert(:user)
{:ok, follow_activity} = ActivityPub.follow(follower, user)
follower = insert(:user)
{:ok, follow_activity} = ActivityPub.follow(follower, user)
@@
-319,7
+322,7
@@
defmodule Pleroma.Web.ActivityPub.UtilsTest do
describe "update_follow_state/2" do
test "updates the state of the given follow activity" do
describe "update_follow_state/2" do
test "updates the state of the given follow activity" do
- user = insert(:user,
info: %{locked: true}
)
+ user = insert(:user,
locked: true
)
follower = insert(:user)
{:ok, follow_activity} = ActivityPub.follow(follower, user)
follower = insert(:user)
{:ok, follow_activity} = ActivityPub.follow(follower, user)
@@
-579,11
+582,19
@@
defmodule Pleroma.Web.ActivityPub.UtilsTest do
%{}
)
%{}
)
+ note_obj = %{
+ "type" => "Note",
+ "id" => activity_ap_id,
+ "content" => content,
+ "published" => activity.object.data["published"],
+ "actor" => AccountView.render("show.json", %{user: target_account})
+ }
+
assert %{
"type" => "Flag",
"content" => ^content,
"context" => ^context,
assert %{
"type" => "Flag",
"content" => ^content,
"context" => ^context,
- "object" => [^target_ap_id, ^
activity_ap_id
],
+ "object" => [^target_ap_id, ^
note_obj
],
"state" => "open"
} = res
end
"state" => "open"
} = res
end