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 3d3becefdb56436cb6e42036500739378f3ec365..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)
@@
-39,9
+42,12
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
test "listing remote packs" do
admin = insert(:user, is_admin: true)
test "listing remote packs" do
admin = insert(:user, is_admin: true)
-
conn = build_conn() |> assign(:user,
admin)
+
%{conn: conn} = oauth_access(["admin:write"], user:
admin)
- resp = conn |> get(emoji_api_path(conn, :list_packs)) |> json_response(200)
+ resp =
+ build_conn()
+ |> get(emoji_api_path(conn, :list_packs))
+ |> json_response(200)
mock(fn
%{method: :get, url: "https://example.com/.well-known/nodeinfo"} ->
mock(fn
%{method: :get, url: "https://example.com/.well-known/nodeinfo"} ->
@@
-123,7
+129,10
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
admin = insert(:user, is_admin: true)
admin = insert(:user, is_admin: true)
- conn = build_conn() |> assign(:user, admin)
+ conn =
+ build_conn()
+ |> assign(:user, admin)
+ |> assign(:token, insert(:oauth_admin_token, user: admin, scopes: ["admin:write"]))
assert (conn
|> put_req_header("content-type", "application/json")
assert (conn
|> put_req_header("content-type", "application/json")
@@
-168,8
+177,6
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
# non-shared, downloaded from the fallback URL
# non-shared, downloaded from the fallback URL
- conn = build_conn() |> assign(:user, admin)
-
assert conn
|> put_req_header("content-type", "application/json")
|> post(
assert conn
|> put_req_header("content-type", "application/json")
|> post(
@@
-205,8
+212,12
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
File.write!(pack_file, original_content)
end)
File.write!(pack_file, original_content)
end)
+ admin = insert(:user, is_admin: true)
+ %{conn: conn} = oauth_access(["admin:write"], user: admin)
+
{:ok,
{:ok,
- admin: insert(:user, is_admin: true),
+ admin: admin,
+ conn: conn,
pack_file: pack_file,
new_data: %{
"license" => "Test license changed",
pack_file: pack_file,
new_data: %{
"license" => "Test license changed",
@@
-217,10
+228,9
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
end
test "for a pack without a fallback source", ctx do
end
test "for a pack without a fallback source", ctx do
- conn =
build_conn()
+ conn =
ctx[:conn]
assert conn
assert conn
- |> assign(:user, ctx[:admin])
|> post(
emoji_api_path(conn, :update_metadata, "test_pack"),
%{
|> post(
emoji_api_path(conn, :update_metadata, "test_pack"),
%{
@@
-250,10
+260,9
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
"74409E2674DAA06C072729C6C8426C4CB3B7E0B85ED77792DB7A436E11D76DAF"
)
"74409E2674DAA06C072729C6C8426C4CB3B7E0B85ED77792DB7A436E11D76DAF"
)
- conn =
build_conn()
+ conn =
ctx[:conn]
assert conn
assert conn
- |> assign(:user, ctx[:admin])
|> post(
emoji_api_path(conn, :update_metadata, "test_pack"),
%{
|> post(
emoji_api_path(conn, :update_metadata, "test_pack"),
%{
@@
-277,10
+286,9
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
new_data = Map.put(ctx[:new_data], "fallback-src", "https://nonshared-pack")
new_data = Map.put(ctx[:new_data], "fallback-src", "https://nonshared-pack")
- conn =
build_conn()
+ conn =
ctx[:conn]
assert (conn
assert (conn
- |> assign(:user, ctx[:admin])
|> post(
emoji_api_path(conn, :update_metadata, "test_pack"),
%{
|> post(
emoji_api_path(conn, :update_metadata, "test_pack"),
%{
@@
-304,8
+312,7
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
end)
admin = insert(:user, is_admin: true)
end)
admin = insert(:user, is_admin: true)
-
- conn = build_conn()
+ %{conn: conn} = oauth_access(["admin:write"], user: admin)
same_name = %{
"action" => "add",
same_name = %{
"action" => "add",
@@
-319,8
+326,6
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
different_name = %{same_name | "shortcode" => "blank_2"}
different_name = %{same_name | "shortcode" => "blank_2"}
- conn = conn |> assign(:user, admin)
-
assert (conn
|> post(emoji_api_path(conn, :update_file, "test_pack"), same_name)
|> json_response(:conflict))["error"] =~ "already exists"
assert (conn
|> post(emoji_api_path(conn, :update_file, "test_pack"), same_name)
|> json_response(:conflict))["error"] =~ "already exists"
@@
-392,8
+397,7
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
end)
admin = insert(:user, is_admin: true)
end)
admin = insert(:user, is_admin: true)
-
- conn = build_conn() |> assign(:user, admin)
+ %{conn: conn} = oauth_access(["admin:write"], user: admin)
assert conn
|> put_req_header("content-type", "application/json")
assert conn
|> put_req_header("content-type", "application/json")
@@
-432,9
+436,9
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
refute Map.has_key?(resp, "test_pack_for_import")
admin = insert(:user, is_admin: true)
refute Map.has_key?(resp, "test_pack_for_import")
admin = insert(:user, is_admin: true)
+ %{conn: conn} = oauth_access(["admin:write"], user: admin)
assert conn
assert conn
- |> assign(:user, admin)
|> post(emoji_api_path(conn, :import_from_fs))
|> json_response(200) == ["test_pack_for_import"]
|> post(emoji_api_path(conn, :import_from_fs))
|> json_response(200) == ["test_pack_for_import"]
@@
-449,11
+453,10
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
File.write!("#{@emoji_dir_path}/test_pack_for_import/emoji.txt", emoji_txt_content)
assert conn
File.write!("#{@emoji_dir_path}/test_pack_for_import/emoji.txt", emoji_txt_content)
assert conn
- |> assign(:user, admin)
|> post(emoji_api_path(conn, :import_from_fs))
|> json_response(200) == ["test_pack_for_import"]
|> post(emoji_api_path(conn, :import_from_fs))
|> json_response(200) == ["test_pack_for_import"]
- resp =
conn
|> get(emoji_api_path(conn, :list_packs)) |> json_response(200)
+ resp =
build_conn()
|> get(emoji_api_path(conn, :list_packs)) |> json_response(200)
assert resp["test_pack_for_import"]["files"] == %{
"blank" => "blank.png",
assert resp["test_pack_for_import"]["files"] == %{
"blank" => "blank.png",