aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-22 15:09:32 +0000
committerlain <lain@soykaf.club>2020-07-22 15:09:32 +0000
commit1c9752cff445ab1f58cea1617d3c7ab73da60e10 (patch)
tree232f995f9acde3e907edf9b88a573d0a2c1841ba /test
parent96f023be5c3b6d41f610ceecd50320da2aacca8d (diff)
parentb157b7dab36f77b0f30ae18022445d586c242300 (diff)
downloadpleroma-1c9752cff445ab1f58cea1617d3c7ab73da60e10.tar.gz
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
Fix /api/pleroma/emoji/packs index endpoint. See merge request pleroma/pleroma!2777
Diffstat (limited to 'test')
-rw-r--r--test/web/pleroma_api/controllers/emoji_pack_controller_test.exs7
1 files changed, 7 insertions, 0 deletions
diff --git a/test/web/pleroma_api/controllers/emoji_pack_controller_test.exs b/test/web/pleroma_api/controllers/emoji_pack_controller_test.exs
index df58a5eb6..e113bb15f 100644
--- a/test/web/pleroma_api/controllers/emoji_pack_controller_test.exs
+++ b/test/web/pleroma_api/controllers/emoji_pack_controller_test.exs
@@ -14,6 +14,8 @@ defmodule Pleroma.Web.PleromaAPI.EmojiPackControllerTest do
)
setup do: clear_config([:auth, :enforce_oauth_admin_scope_usage], false)
+ setup do: clear_config([:instance, :public], true)
+
setup do
admin = insert(:user, is_admin: true)
token = insert(:oauth_admin_token, user: admin)
@@ -27,6 +29,11 @@ defmodule Pleroma.Web.PleromaAPI.EmojiPackControllerTest do
{:ok, %{admin_conn: admin_conn}}
end
+ test "GET /api/pleroma/emoji/packs when :public: false", %{conn: conn} do
+ Config.put([:instance, :public], false)
+ conn |> get("/api/pleroma/emoji/packs") |> json_response_and_validate_schema(200)
+ end
+
test "GET /api/pleroma/emoji/packs", %{conn: conn} do
resp = conn |> get("/api/pleroma/emoji/packs") |> json_response_and_validate_schema(200)