summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/status_controller_test.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-10-24 09:23:59 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-10-24 09:23:59 +0300
commit99cf1ef9be93ebab04d088848804369e6295a76d (patch)
tree94738e2bc0ee642db4abc4e65a9798782de59623 /test/web/mastodon_api/controllers/status_controller_test.exs
parentd3fb9e02cc0ce7dc462e587e639e117aaef5fbc5 (diff)
parent17c237ba808d4356bb1e202e459680563b79ef99 (diff)
downloadpleroma-99cf1ef9be93ebab04d088848804369e6295a76d.tar.gz
pleroma-99cf1ef9be93ebab04d088848804369e6295a76d.zip
Merge branch 'develop' into issue/1276
Diffstat (limited to 'test/web/mastodon_api/controllers/status_controller_test.exs')
-rw-r--r--test/web/mastodon_api/controllers/status_controller_test.exs4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/mastodon_api/controllers/status_controller_test.exs b/test/web/mastodon_api/controllers/status_controller_test.exs
index 4da610b28..a96fd860b 100644
--- a/test/web/mastodon_api/controllers/status_controller_test.exs
+++ b/test/web/mastodon_api/controllers/status_controller_test.exs
@@ -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)
- admin = insert(:user, info: %{is_admin: true})
- moderator = insert(:user, info: %{is_moderator: true})
+ admin = insert(:user, is_admin: true)
+ moderator = insert(:user, is_moderator: true)
res_conn =
conn