summaryrefslogtreecommitdiff
path: root/test/web/masto_fe_controller_test.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-07-02 09:57:57 -0500
committerMark Felder <feld@FreeBSD.org>2020-07-02 09:57:57 -0500
commit6b5563ed2cdb0bff95fbc42ba0e4687c8ed1311d (patch)
tree3dfb2172f49f7ca21f9adaf945897d869de8786d /test/web/masto_fe_controller_test.exs
parentf89390110b6b601fc505e63c3e36516d7ca96f5c (diff)
parent4c044f62258b33a95b8281e1eb42a5e0ce47d42d (diff)
downloadpleroma-6b5563ed2cdb0bff95fbc42ba0e4687c8ed1311d.tar.gz
pleroma-6b5563ed2cdb0bff95fbc42ba0e4687c8ed1311d.zip
Merge branch 'develop' into feature/1885-MRF-metadata
Diffstat (limited to 'test/web/masto_fe_controller_test.exs')
-rw-r--r--test/web/masto_fe_controller_test.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/masto_fe_controller_test.exs b/test/web/masto_fe_controller_test.exs
index 1d107d56c..f3b54b5f2 100644
--- a/test/web/masto_fe_controller_test.exs
+++ b/test/web/masto_fe_controller_test.exs
@@ -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