projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feat/enforce-admin-scope-unconditionally' into 'develop'
[akkoma]
/
test
/
pleroma
/
web
/
pleroma_api
/
controllers
/
emoji_pack_controller_test.exs
diff --git
a/test/pleroma/web/pleroma_api/controllers/emoji_pack_controller_test.exs
b/test/pleroma/web/pleroma_api/controllers/emoji_pack_controller_test.exs
index d9385389b2538cc087a2677e93f3b1085a34d18a..d1ba067b8eebb9d69485118db402b77277fb1966 100644
(file)
--- a/
test/pleroma/web/pleroma_api/controllers/emoji_pack_controller_test.exs
+++ b/
test/pleroma/web/pleroma_api/controllers/emoji_pack_controller_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.PleromaAPI.EmojiPackControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.PleromaAPI.EmojiPackControllerTest do
@@
-13,7
+13,6
@@
defmodule Pleroma.Web.PleromaAPI.EmojiPackControllerTest do
Pleroma.Config.get!([:instance, :static_dir]),
"emoji"
)
Pleroma.Config.get!([:instance, :static_dir]),
"emoji"
)
- setup do: clear_config([:auth, :enforce_oauth_admin_scope_usage], false)
setup do: clear_config([:instance, :public], true)
setup do: clear_config([:instance, :public], true)
@@
-31,7
+30,7
@@
defmodule Pleroma.Web.PleromaAPI.EmojiPackControllerTest do
end
test "GET /api/pleroma/emoji/packs when :public: false", %{conn: conn} do
end
test "GET /api/pleroma/emoji/packs when :public: false", %{conn: conn} do
-
Config.put
([:instance, :public], false)
+
clear_config
([:instance, :public], false)
conn |> get("/api/pleroma/emoji/packs") |> json_response_and_validate_schema(200)
end
conn |> get("/api/pleroma/emoji/packs") |> json_response_and_validate_schema(200)
end