hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

Browse source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Ivan Tashkinov 2020-12-07 21:45:04 +03:00
commit c8e7ace812
8 changed files with 602 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/pleroma/web/admin_api/controllers/config_controller_test.exs
View file

@ -162,7 +162,9 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest do
end
end
test "POST /api/pleroma/admin/config error", %{conn: conn} do
test "POST /api/pleroma/admin/config with configdb disabled", %{conn: conn} do
clear_config(:configurable_from_database, false)
conn =
conn
|> put_req_header("content-type", "application/json")

2
test/pleroma/web/admin_api/controllers/relay_controller_test.exs
View file

@ -60,7 +60,7 @@ defmodule Pleroma.Web.AdminAPI.RelayControllerTest do
conn = get(conn, "/api/pleroma/admin/relay")
assert json_response_and_validate_schema(conn, 200)["relays"] == [
assert json_response_and_validate_schema(conn, 200)["relays"] |> Enum.sort() == [
%{
"actor" => "http://mastodon.example.org/users/admin",
"followed_back" => true