summaryrefslogtreecommitdiff
path: root/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2019-10-23 17:34:42 +0000
committerfeld <feld@feld.me>2019-10-23 17:34:42 +0000
commit17c237ba808d4356bb1e202e459680563b79ef99 (patch)
tree62faffc1033054e2aa1414d85bc0009c004c6910 /test/web/pleroma_api/controllers/emoji_api_controller_test.exs
parent54077677eaad44ea355c7f0db7ea5e94183d5a30 (diff)
parentc0246309a5013b17a405644a0918ec0d3569eaf1 (diff)
downloadpleroma-17c237ba808d4356bb1e202e459680563b79ef99.tar.gz
pleroma-17c237ba808d4356bb1e202e459680563b79ef99.zip
Merge branch '1304-user-info-deprecation' into 'develop'
[#1304] User.Info deprecation Closes #1304 See merge request pleroma/pleroma!1851
Diffstat (limited to 'test/web/pleroma_api/controllers/emoji_api_controller_test.exs')
-rw-r--r--test/web/pleroma_api/controllers/emoji_api_controller_test.exs12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/web/pleroma_api/controllers/emoji_api_controller_test.exs b/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
index 5f74460e8..3d3becefd 100644
--- a/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
+++ b/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
@@ -38,7 +38,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
end
test "listing remote packs" do
- admin = insert(:user, info: %{is_admin: true})
+ admin = insert(:user, is_admin: true)
conn = build_conn() |> assign(:user, admin)
resp = conn |> get(emoji_api_path(conn, :list_packs)) |> json_response(200)
@@ -121,7 +121,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
text(File.read!("#{@emoji_dir_path}/test_pack_nonshared/nonshared.zip"))
end)
- admin = insert(:user, info: %{is_admin: true})
+ admin = insert(:user, is_admin: true)
conn = build_conn() |> assign(:user, admin)
@@ -206,7 +206,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
end)
{:ok,
- admin: insert(:user, info: %{is_admin: true}),
+ admin: insert(:user, is_admin: true),
pack_file: pack_file,
new_data: %{
"license" => "Test license changed",
@@ -303,7 +303,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
File.rm_rf!("#{@emoji_dir_path}/test_pack/dir_2")
end)
- admin = insert(:user, info: %{is_admin: true})
+ admin = insert(:user, is_admin: true)
conn = build_conn()
@@ -391,7 +391,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
File.rm_rf!("#{@emoji_dir_path}/test_created")
end)
- admin = insert(:user, info: %{is_admin: true})
+ admin = insert(:user, is_admin: true)
conn = build_conn() |> assign(:user, admin)
@@ -431,7 +431,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
refute Map.has_key?(resp, "test_pack_for_import")
- admin = insert(:user, info: %{is_admin: true})
+ admin = insert(:user, is_admin: true)
assert conn
|> assign(:user, admin)