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 1427-oauth-admin-scopes
[akkoma]
/
test
/
web
/
mastodon_api
/
controllers
/
status_controller_test.exs
diff --git
a/test/web/mastodon_api/controllers/status_controller_test.exs
b/test/web/mastodon_api/controllers/status_controller_test.exs
index a96fd860b50fe2edb08996e0cf7af3d5bc93137b..5fbe947ba3df9943be64b375f0c8a48591c22bb2 100644
(file)
--- a/
test/web/mastodon_api/controllers/status_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/status_controller_test.exs
@@
-1108,7
+1108,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
activity: activity
} do
other_user = insert(:user)
activity: activity
} do
other_user = insert(:user)
- {:ok,
user
} = User.block(user, other_user)
+ {:ok,
_user_relationship
} = User.block(user, other_user)
{:ok, _, _} = CommonAPI.favorite(activity.id, other_user)
{:ok, _, _} = CommonAPI.favorite(activity.id, other_user)
@@
-1205,7
+1205,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
activity: activity
} do
other_user = insert(:user)
activity: activity
} do
other_user = insert(:user)
- {:ok,
user
} = User.block(user, other_user)
+ {:ok,
_user_relationship
} = User.block(user, other_user)
{:ok, _, _} = CommonAPI.repeat(activity.id, other_user)
{:ok, _, _} = CommonAPI.repeat(activity.id, other_user)