projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
[akkoma]
/
test
/
web
/
masto_fe_controller_test.exs
diff --git
a/test/web/masto_fe_controller_test.exs
b/test/web/masto_fe_controller_test.exs
index 9a2d76e0b46b6a579f23df37f1697d0f62172606..1d107d56c0087bab1f910a7af684593437447d5d 100644
(file)
--- a/
test/web/masto_fe_controller_test.exs
+++ b/
test/web/masto_fe_controller_test.exs
@@
-10,7
+10,7
@@
defmodule Pleroma.Web.MastodonAPI.MastoFEController do
import Pleroma.Factory
import Pleroma.Factory
- clear_config([:instance, :public])
+
setup do:
clear_config([:instance, :public])
test "put settings", %{conn: conn} do
user = insert(:user)
test "put settings", %{conn: conn} do
user = insert(:user)