projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma...
[akkoma]
/
test
/
pleroma
/
web
/
activity_pub
/
transmogrifier
/
block_handling_test.exs
diff --git
a/test/pleroma/web/activity_pub/transmogrifier/block_handling_test.exs
b/test/pleroma/web/activity_pub/transmogrifier/block_handling_test.exs
index 71f1a0ed52bf2ed690c0a2a4cf7b2efdb40fdffd..6adad88f5ae92ff3e4c22f29d360acad41df5fc0 100644
(file)
--- a/
test/pleroma/web/activity_pub/transmogrifier/block_handling_test.exs
+++ b/
test/pleroma/web/activity_pub/transmogrifier/block_handling_test.exs
@@
-3,7
+3,7
@@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.Transmogrifier.BlockHandlingTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.Transmogrifier.BlockHandlingTest do
- use Pleroma.DataCase
+ use Pleroma.DataCase
, async: true
alias Pleroma.Activity
alias Pleroma.User
alias Pleroma.Activity
alias Pleroma.User
@@
-16,7
+16,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.BlockHandlingTest do
data =
File.read!("test/fixtures/mastodon-block-activity.json")
data =
File.read!("test/fixtures/mastodon-block-activity.json")
- |>
Poi
son.decode!()
+ |>
Ja
son.decode!()
|> Map.put("object", user.ap_id)
blocker = insert(:user, ap_id: data["actor"])
|> Map.put("object", user.ap_id)
blocker = insert(:user, ap_id: data["actor"])
@@
-36,12
+36,12
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.BlockHandlingTest do
data =
File.read!("test/fixtures/mastodon-block-activity.json")
data =
File.read!("test/fixtures/mastodon-block-activity.json")
- |>
Poi
son.decode!()
+ |>
Ja
son.decode!()
|> Map.put("object", blocked.ap_id)
|> Map.put("actor", blocker.ap_id)
|> Map.put("object", blocked.ap_id)
|> Map.put("actor", blocker.ap_id)
- {:ok, blocker} = User.follow(blocker, blocked)
- {:ok, blocked} = User.follow(blocked, blocker)
+ {:ok, blocker
, blocked
} = User.follow(blocker, blocked)
+ {:ok, blocked
, blocker
} = User.follow(blocked, blocker)
assert User.following?(blocker, blocked)
assert User.following?(blocked, blocker)
assert User.following?(blocker, blocked)
assert User.following?(blocked, blocker)