summaryrefslogtreecommitdiff
path: root/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-04-21 16:29:19 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-04-21 16:29:19 +0300
commitf685cbd30940b3fd92a2f6c8a161729bc2ceaab6 (patch)
treeb53baa5dd129ec691181036ea3d51248ca4eaf3f /test/web/pleroma_api/controllers/emoji_api_controller_test.exs
parent3c828016d9d1ecb1ebcebb00aaadec2ace37f807 (diff)
downloadpleroma-f685cbd30940b3fd92a2f6c8a161729bc2ceaab6.tar.gz
pleroma-f685cbd30940b3fd92a2f6c8a161729bc2ceaab6.zip
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
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.exs11
1 files changed, 5 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 435fb6592..4246eb400 100644
--- a/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
+++ b/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
@@ -38,8 +38,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
end
test "listing remote packs" do
- admin = insert(:user, is_admin: true)
- %{conn: conn} = oauth_access(["admin:write"], user: admin)
+ conn = build_conn()
resp =
build_conn()
@@ -76,7 +75,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
assert Enum.find(arch, fn {n, _} -> n == 'blank.png' end)
end
- test "downloading shared & unshared packs from another instance via download_from, deleting them" do
+ test "downloading shared & unshared packs from another instance, deleting them" do
on_exit(fn ->
File.rm_rf!("#{@emoji_dir_path}/test_pack2")
File.rm_rf!("#{@emoji_dir_path}/test_pack_nonshared2")
@@ -136,7 +135,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
|> post(
emoji_api_path(
conn,
- :download_from
+ :save_from
),
%{
instance_address: "https://old-instance",
@@ -152,7 +151,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
|> post(
emoji_api_path(
conn,
- :download_from
+ :save_from
),
%{
instance_address: "https://example.com",
@@ -179,7 +178,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
|> post(
emoji_api_path(
conn,
- :download_from
+ :save_from
),
%{
instance_address: "https://example.com",