diff options
| author | lain <lain@soykaf.club> | 2019-06-20 17:43:57 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-06-20 17:43:57 +0000 |
| commit | 3b48876cf02b35af953bf463987e42675a9e6180 (patch) | |
| tree | 584217291832436738724043ee8f52e1eae6d9fa /test | |
| parent | ba584364e905531417dae2e07675dbbf60c3a007 (diff) | |
| parent | 32320c1ee94a999082f10c9f9a3c6d55ced21e21 (diff) | |
| download | pleroma-3b48876cf02b35af953bf463987e42675a9e6180.tar.gz | |
Merge branch 'fix/dynamic-configuration' into 'develop'
Fixes for dynamic configuration
See merge request pleroma/pleroma!1313
Diffstat (limited to 'test')
| -rw-r--r-- | test/tasks/config_test.exs | 2 | ||||
| -rw-r--r-- | test/web/admin_api/admin_api_controller_test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/tasks/config_test.exs b/test/tasks/config_test.exs index 7d3b1860c..d448b0444 100644 --- a/test/tasks/config_test.exs +++ b/test/tasks/config_test.exs @@ -5,7 +5,7 @@ defmodule Mix.Tasks.Pleroma.ConfigTest do setup_all do Mix.shell(Mix.Shell.Process) - temp_file = "config/temp.migrated.secret.exs" + temp_file = "config/temp.exported_from_db.secret.exs" dynamic = Pleroma.Config.get([:instance, :dynamic_configuration]) diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index 18f64f2b7..2a5912645 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -1334,7 +1334,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do setup %{conn: conn} do admin = insert(:user, info: %{is_admin: true}) - temp_file = "config/test.migrated.secret.exs" + temp_file = "config/test.exported_from_db.secret.exs" on_exit(fn -> Application.delete_env(:pleroma, :key1) |