diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-12-07 21:45:04 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-12-07 21:45:04 +0300 |
| commit | c8e7ace812ef199b6d24013e7d2699daf1b79d55 (patch) | |
| tree | decbb4f42b4758370e2151d946698a3c0c6e3593 /test/pleroma/web/admin_api/controllers | |
| parent | a010c5b16a395d823a98cd088c83acd098930ade (diff) | |
| parent | ed76323776f2506cfefbe78c369fdb7ccfe3b650 (diff) | |
| download | pleroma-c8e7ace812ef199b6d24013e7d2699daf1b79d55.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/pleroma/web/admin_api/controllers')
| -rw-r--r-- | test/pleroma/web/admin_api/controllers/config_controller_test.exs | 4 | ||||
| -rw-r--r-- | test/pleroma/web/admin_api/controllers/relay_controller_test.exs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/pleroma/web/admin_api/controllers/config_controller_test.exs b/test/pleroma/web/admin_api/controllers/config_controller_test.exs index 765a5a4b7..e6b203e74 100644 --- a/test/pleroma/web/admin_api/controllers/config_controller_test.exs +++ b/test/pleroma/web/admin_api/controllers/config_controller_test.exs @@ -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") diff --git a/test/pleroma/web/admin_api/controllers/relay_controller_test.exs b/test/pleroma/web/admin_api/controllers/relay_controller_test.exs index b4c5e7567..379067a62 100644 --- a/test/pleroma/web/admin_api/controllers/relay_controller_test.exs +++ b/test/pleroma/web/admin_api/controllers/relay_controller_test.exs @@ -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 |