Merge branch 'develop' into feature/gen-magic

[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 f9870a852e5ca473a3546c69b3e971c68d54768d..f3b54b5f2cb36ec163c17ad7df93bdb62a77d7fb 100644 (file)
--- a/test/web/masto_fe_controller_test.exs
+++ b/test/web/masto_fe_controller_test.exs
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.MastodonAPI.MastoFEController do
@@ -10,7 +10,7 @@ defmodule Pleroma.Web.MastodonAPI.MastoFEController do
 
   import Pleroma.Factory
 
-  clear_config([:instance, :public])
+  setup do: clear_config([:instance, :public])
 
   test "put settings", %{conn: conn} do
     user = insert(:user)
@@ -24,7 +24,7 @@ defmodule Pleroma.Web.MastodonAPI.MastoFEController do
     assert _result = json_response(conn, 200)
 
     user = User.get_cached_by_ap_id(user.ap_id)
-    assert user.settings == %{"programming" => "socks"}
+    assert user.mastofe_settings == %{"programming" => "socks"}
   end
 
   describe "index/2 redirections" do