projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...
[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 5c67d41c5a31de070e23a469454dc7facfa0384d..7d6d0814d7eb6e21d035d5f7fb4c8592f0f50c8d 100644
(file)
--- a/
test/web/activity_pub/transmogrifier/follow_handling_test.exs
+++ b/
test/web/activity_pub/transmogrifier/follow_handling_test.exs
@@
-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_
block
} = 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")