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/1411
[akkoma]
/
test
/
web
/
activity_pub
/
transmogrifier
/
follow_handling_test.exs
diff --git
a/test/web/activity_pub/transmogrifier/follow_handling_test.exs
b/test/web/activity_pub/transmogrifier/follow_handling_test.exs
index 99ab573c518f2556954914a2be099e959c7424fe..7d6d0814d7eb6e21d035d5f7fb4c8592f0f50c8d 100644
(file)
--- a/
test/web/activity_pub/transmogrifier/follow_handling_test.exs
+++ b/
test/web/activity_pub/transmogrifier/follow_handling_test.exs
@@
-58,7
+58,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do
end
test "with locked accounts, it does not create a follow or an accept" do
end
test "with locked accounts, it does not create a follow or an accept" do
- user = insert(:user,
info: %{locked: true}
)
+ user = insert(:user,
locked: true
)
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
@@
-128,7
+128,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do
user = insert(:user)
{:ok, target} = User.get_or_fetch("http://mastodon.example.org/users/admin")
user = insert(:user)
{:ok, target} = User.get_or_fetch("http://mastodon.example.org/users/admin")
- {:ok,
user
} = User.block(user, target)
+ {:ok,
_user_relationship
} = User.block(user, target)
data =
File.read!("test/fixtures/mastodon-follow-activity.json")
data =
File.read!("test/fixtures/mastodon-follow-activity.json")