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 ce964359b81436df8c7f78e03565faee4a714521..5fbe947ba3df9943be64b375f0c8a48591c22bb2 100644
(file)
--- a/
test/web/mastodon_api/controllers/status_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/status_controller_test.exs
@@
-33,7
+33,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
[conn: conn]
end
[conn: conn]
end
- test "posting a status
and checks reblog count after perform all backroud job
", %{conn: conn} do
+ test "posting a status
does not increment reblog_count when relaying
", %{conn: conn} do
Pleroma.Config.put([:instance, :federating], true)
Pleroma.Config.get([:instance, :allow_relay], true)
user = insert(:user)
Pleroma.Config.put([:instance, :federating], true)
Pleroma.Config.get([:instance, :allow_relay], true)
user = insert(:user)
@@
-558,8
+558,8
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
test "when you're an admin or moderator", %{conn: conn} do
activity1 = insert(:note_activity)
activity2 = insert(:note_activity)
test "when you're an admin or moderator", %{conn: conn} do
activity1 = insert(:note_activity)
activity2 = insert(:note_activity)
- admin = insert(:user, i
nfo: %{is_admin: true}
)
- moderator = insert(:user, i
nfo: %{is_moderator: true}
)
+ admin = insert(:user, i
s_admin: true
)
+ moderator = insert(:user, i
s_moderator: true
)
res_conn =
conn
res_conn =
conn
@@
-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)