projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/bridgy-user-icon' into 'develop'
[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 b8e4ad827f43ca84fd2b7ba9a8648aa683ebed42..70da06d2eec4e8da85897c33336f61de82dbac5c 100644
(file)
--- a/
test/pleroma/web/activity_pub/transmogrifier/block_handling_test.exs
+++ b/
test/pleroma/web/activity_pub/transmogrifier/block_handling_test.exs
@@
-1,9
+1,9
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# 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
@@
-40,8
+40,8
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier.BlockHandlingTest do
|> 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)