Commit 4a6b49d0 authored by feld's avatar feld
Browse files

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

Fix test warnings

See merge request !3452
parents 30943b73 017f947f
Pipeline #36446 passed with stages
in 92 minutes and 22 seconds
......@@ -1427,30 +1427,27 @@ test "custom instance thumbnail", %{conn: conn} do
]
}
res =
assert conn
|> put_req_header("content-type", "application/json")
|> post("/api/pleroma/admin/config", %{"configs" => [params]})
|> json_response_and_validate_schema(200)
assert res == %{
"configs" => [
%{
"db" => [":instance_thumbnail"],
"group" => ":pleroma",
"key" => ":instance",
"value" => params["value"]
}
],
"need_reboot" => false
}
_res =
assert conn
|> get("/api/v1/instance")
|> json_response_and_validate_schema(200)
assert conn
|> put_req_header("content-type", "application/json")
|> post("/api/pleroma/admin/config", %{"configs" => [params]})
|> json_response_and_validate_schema(200) ==
%{
"configs" => [
%{
"db" => [":instance_thumbnail"],
"group" => ":pleroma",
"key" => ":instance",
"value" => params["value"]
}
],
"need_reboot" => false
}
assert res = %{"thumbnail" => "https://example.com/media/new_thumbnail.jpg"}
assert conn
|> get("/api/v1/instance")
|> json_response_and_validate_schema(200)
|> Map.take(["thumbnail"]) ==
%{"thumbnail" => "https://example.com/media/new_thumbnail.jpg"}
end
test "Concurrent Limiter", %{conn: conn} do
......
......@@ -14,7 +14,7 @@ defmodule Pleroma.Web.ShoutChannelTest do
{:ok, _, socket} =
socket(UserSocket, "", %{user_name: user.nickname})
|> subscribe_and_join(ShoutChannel, "shout:public")
|> subscribe_and_join(ShoutChannel, "chat:public")
{:ok, socket: socket}
end
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment