bss
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/config-test-warning' into 'develop' 

Fix test warnings

See merge request pleroma/pleroma!3452
This commit is contained in:
feld 2021-06-07 21:22:23 +00:00
parent 30943b739d 017f947fc1
commit 4a6b49d0b4
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/pleroma/web/admin_api/controllers/config_controller_test.exs
View File

@ -1427,13 +1427,11 @@ test "custom instance thumbnail", %{conn: conn} do
] ]
} }
res =
assert conn assert conn
|> put_req_header("content-type", "application/json") |> put_req_header("content-type", "application/json")
|> post("/api/pleroma/admin/config", %{"configs" => [params]}) |> post("/api/pleroma/admin/config", %{"configs" => [params]})
|> json_response_and_validate_schema(200) |> json_response_and_validate_schema(200) ==
%{
assert res == %{
"configs" => [ "configs" => [
%{ %{
"db" => [":instance_thumbnail"], "db" => [":instance_thumbnail"],
@ -1445,12 +1443,11 @@ test "custom instance thumbnail", %{conn: conn} do
"need_reboot" => false "need_reboot" => false
} }
_res =
assert conn assert conn
|> get("/api/v1/instance") |> get("/api/v1/instance")
|> json_response_and_validate_schema(200) |> json_response_and_validate_schema(200)
|> Map.take(["thumbnail"]) ==
assert res = %{"thumbnail" => "https://example.com/media/new_thumbnail.jpg"} %{"thumbnail" => "https://example.com/media/new_thumbnail.jpg"}
end end
test "Concurrent Limiter", %{conn: conn} do test "Concurrent Limiter", %{conn: conn} do

2
test/pleroma/web/shout_channel_test.ex → test/pleroma/web/shout_channel_test.exs
View File

@ -14,7 +14,7 @@ defmodule Pleroma.Web.ShoutChannelTest do
{:ok, _, socket} = {:ok, _, socket} =
socket(UserSocket, "", %{user_name: user.nickname}) socket(UserSocket, "", %{user_name: user.nickname})
|> subscribe_and_join(ShoutChannel, "shout:public") |> subscribe_and_join(ShoutChannel, "chat:public")
{:ok, socket: socket} {:ok, socket: socket}
end end