diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-10-24 14:42:14 +0700 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-10-24 14:55:36 +0700 |
commit | 4c1dd55c48f80f3ebdb26d1a0c1a75b7922f578c (patch) | |
tree | f296a9b23362e59daf1eac6b669886be8dab1576 /test/web/pleroma_api/controllers/emoji_api_controller_test.exs | |
parent | 478f0883eb994c639923b7b27259a02bcef8708c (diff) | |
parent | 17c237ba808d4356bb1e202e459680563b79ef99 (diff) | |
download | pleroma-4c1dd55c48f80f3ebdb26d1a0c1a75b7922f578c.tar.gz pleroma-4c1dd55c48f80f3ebdb26d1a0c1a75b7922f578c.zip |
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
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.exs | 12 |
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) |