summaryrefslogtreecommitdiff
path: root/test/web/admin_api/admin_api_controller_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-02-20 11:36:48 +0000
committerlain <lain@soykaf.club>2020-02-20 11:36:48 +0000
commitcf4ecffcea84d9b214f922a973d50c699317a202 (patch)
tree27eeb915193738f167db55119afb5a5ebafa9b6b /test/web/admin_api/admin_api_controller_test.exs
parent3b78695c9828bc49a5c7706437af5f24fc4475de (diff)
parent226f4d5ef93805e2ff93f00d443238ab7afeb3e6 (diff)
downloadpleroma-cf4ecffcea84d9b214f922a973d50c699317a202.tar.gz
pleroma-cf4ecffcea84d9b214f922a973d50c699317a202.zip
Merge branch 'tests-clear-config-tweaks' into 'develop'
Tweaks to `clear_config` calls in tests See merge request pleroma/pleroma!2209
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 60db58144..908ef4d37 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) ==