projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1304-user-info-deprecation' into 'develop'
[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 7b52abdce1a8f1ee7129f4083c89fa26474880ea..a96fd860b50fe2edb08996e0cf7af3d5bc93137b 100644
(file)
--- a/
test/web/mastodon_api/controllers/status_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/status_controller_test.exs
@@
-19,6
+19,9
@@
defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
import Pleroma.Factory
import Pleroma.Factory
+ clear_config([:instance, :federating])
+ clear_config([:instance, :allow_relay])
+
describe "posting statuses" do
setup do
user = insert(:user)
describe "posting statuses" do
setup do
user = insert(:user)
@@
-30,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)
@@
-555,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