summaryrefslogtreecommitdiff
path: root/test/web/admin_api/admin_api_controller_test.exs
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-02-21 10:02:37 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-02-21 10:02:37 +0300
commit13918cb545d583decfb728300850b307c59e2031 (patch)
tree9bf3d5f4c2e51eec87bd0cd1e8a46a6b94816bfc /test/web/admin_api/admin_api_controller_test.exs
parentc9db0507f8d49aee9988b0b63477672f5df9c0b2 (diff)
parent292031f6dd809accbcb3a5ba59d0100d807c5d72 (diff)
downloadpleroma-13918cb545d583decfb728300850b307c59e2031.tar.gz
pleroma-13918cb545d583decfb728300850b307c59e2031.zip
Merge branch 'develop' into gun
Diffstat (limited to 'test/web/admin_api/admin_api_controller_test.exs')
-rw-r--r--test/web/admin_api/admin_api_controller_test.exs2
1 files changed, 0 insertions, 2 deletions
diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs
index 5b0c29439..0cab546ac 100644
--- a/test/web/admin_api/admin_api_controller_test.exs
+++ b/test/web/admin_api/admin_api_controller_test.exs
@@ -1893,9 +1893,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
end
test "when configuration from database is off", %{conn: conn} do
- initial = Config.get(:configurable_from_database)
Config.put(:configurable_from_database, false)
- on_exit(fn -> Config.put(:configurable_from_database, initial) end)
conn = get(conn, "/api/pleroma/admin/config")
assert json_response(conn, 400) ==