projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into issue/1383
[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 e1b484daefc1e1f618b20462742c2bb4b971e133..6f1ea78eced1631c1f74be53ab6ad5950fb799d1 100644
(file)
--- a/
test/web/pleroma_api/controllers/emoji_api_controller_test.exs
+++ b/
test/web/pleroma_api/controllers/emoji_api_controller_test.exs
@@
-6,7
+6,6
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
use Pleroma.Web.ConnCase
import Tesla.Mock
use Pleroma.Web.ConnCase
import Tesla.Mock
-
import Pleroma.Factory
@emoji_dir_path Path.join(
import Pleroma.Factory
@emoji_dir_path Path.join(
@@
-14,6
+13,10
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
"emoji"
)
"emoji"
)
+ clear_config([:auth, :enforce_oauth_admin_scope_usage]) do
+ Pleroma.Config.put([:auth, :enforce_oauth_admin_scope_usage], false)
+ end
+
test "shared & non-shared pack information in list_packs is ok" do
conn = build_conn()
resp = conn |> get(emoji_api_path(conn, :list_packs)) |> json_response(200)
test "shared & non-shared pack information in list_packs is ok" do
conn = build_conn()
resp = conn |> get(emoji_api_path(conn, :list_packs)) |> json_response(200)