projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
[akkoma]
/
test
/
web
/
pleroma_api
/
controllers
/
emoji_api_controller_test.exs
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 5f74460e8e40e46c5778d9509c82456e4416df36..3d3becefdb56436cb6e42036500739378f3ec365 100644
(file)
--- 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
end
test "listing remote packs" do
- admin = insert(:user, i
nfo: %{is_admin: true}
)
+ admin = insert(:user, i
s_admin: true
)
conn = build_conn() |> assign(:user, admin)
resp = conn |> get(emoji_api_path(conn, :list_packs)) |> json_response(200)
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)
text(File.read!("#{@emoji_dir_path}/test_pack_nonshared/nonshared.zip"))
end)
- admin = insert(:user, i
nfo: %{is_admin: true}
)
+ admin = insert(:user, i
s_admin: true
)
conn = build_conn() |> assign(:user, admin)
conn = build_conn() |> assign(:user, admin)
@@
-206,7
+206,7
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
end)
{:ok,
end)
{:ok,
- admin: insert(:user, i
nfo: %{is_admin: true}
),
+ admin: insert(:user, i
s_admin: true
),
pack_file: pack_file,
new_data: %{
"license" => "Test license changed",
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)
File.rm_rf!("#{@emoji_dir_path}/test_pack/dir_2")
end)
- admin = insert(:user, i
nfo: %{is_admin: true}
)
+ admin = insert(:user, i
s_admin: true
)
conn = build_conn()
conn = build_conn()
@@
-391,7
+391,7
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
File.rm_rf!("#{@emoji_dir_path}/test_created")
end)
File.rm_rf!("#{@emoji_dir_path}/test_created")
end)
- admin = insert(:user, i
nfo: %{is_admin: true}
)
+ admin = insert(:user, i
s_admin: true
)
conn = build_conn() |> assign(:user, admin)
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")
refute Map.has_key?(resp, "test_pack_for_import")
- admin = insert(:user, i
nfo: %{is_admin: true}
)
+ admin = insert(:user, i
s_admin: true
)
assert conn
|> assign(:user, admin)
assert conn
|> assign(:user, admin)