projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'oauth_secure_redirect' into 'develop'
[akkoma]
/
test
/
web
/
admin_api
/
admin_api_controller_test.exs
diff --git
a/test/web/admin_api/admin_api_controller_test.exs
b/test/web/admin_api/admin_api_controller_test.exs
index 18f64f2b717f41c5c1e2d1bdd356a807c77b0789..2a591264597061644a23df51ab11da43cc1e892a 100644
(file)
--- 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)