projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'
[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 5f74460e8e40e46c5778d9509c82456e4416df36..e1b484daefc1e1f618b20462742c2bb4b971e133 100644
(file)
--- a/
test/web/pleroma_api/controllers/emoji_api_controller_test.exs
+++ b/
test/web/pleroma_api/controllers/emoji_api_controller_test.exs
@@
-38,10
+38,13
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
end
test "listing remote packs" do
end
test "listing remote packs" do
- admin = insert(:user, i
nfo: %{is_admin: true}
)
-
conn = build_conn() |> assign(:user,
admin)
+ admin = insert(:user, i
s_admin: true
)
+
%{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"} ->
@@
-121,9
+124,12
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
text(File.read!("#{@emoji_dir_path}/test_pack_nonshared/nonshared.zip"))
end)
text(File.read!("#{@emoji_dir_path}/test_pack_nonshared/nonshared.zip"))
end)
- admin = insert(:user, i
nfo: %{is_admin: true}
)
+ admin = insert(:user, i
s_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
+174,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
+209,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, info: %{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
+225,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
+257,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
+283,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"),
%{
@@
-303,9
+308,8
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
File.rm_rf!("#{@emoji_dir_path}/test_pack/dir_2")
end)
File.rm_rf!("#{@emoji_dir_path}/test_pack/dir_2")
end)
- admin = insert(:user, info: %{is_admin: true})
-
- conn = build_conn()
+ admin = insert(:user, is_admin: true)
+ %{conn: conn} = oauth_access(["admin:write"], user: admin)
same_name = %{
"action" => "add",
same_name = %{
"action" => "add",
@@
-319,8
+323,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"
@@
-391,9
+393,8
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
File.rm_rf!("#{@emoji_dir_path}/test_created")
end)
File.rm_rf!("#{@emoji_dir_path}/test_created")
end)
- admin = insert(:user, info: %{is_admin: true})
-
- conn = build_conn() |> assign(:user, admin)
+ admin = insert(:user, is_admin: true)
+ %{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")
@@
-431,10
+432,10
@@
defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
refute Map.has_key?(resp, "test_pack_for_import")
refute Map.has_key?(resp, "test_pack_for_import")
- admin = insert(:user, info: %{is_admin: true})
+ 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
+450,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",