diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-21 06:41:13 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-21 06:41:13 +0300 |
| commit | d55358f3705c34510f5ec1d9cef7ab3b0f11ed2f (patch) | |
| tree | 2a6018046d37201c6d0236a0ea23ffabbeb86d5c /test/web/admin_api/admin_api_controller_test.exs | |
| parent | 4bec121798218f8abf8d2915fa7c26ccb23a4f4a (diff) | |
| parent | 2437f5128407bbcdfc152ea3f008d7eecc1728f2 (diff) | |
| download | pleroma-d55358f3705c34510f5ec1d9cef7ab3b0f11ed2f.tar.gz | |
Merge branch 'develop' into release-docs
Diffstat (limited to 'test/web/admin_api/admin_api_controller_test.exs')
| -rw-r--r-- | test/web/admin_api/admin_api_controller_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
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) |