diff options
author | Mark Felder <feld@FreeBSD.org> | 2020-07-03 10:36:41 -0500 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2020-07-03 10:36:41 -0500 |
commit | 4695bdd81bf9d2caed4337473d35ba021527e8a8 (patch) | |
tree | 0bc60c1bbc03d994701a282f47d32e856b54cff0 /test/web/masto_fe_controller_test.exs | |
parent | cc837f9d157f9d43a015a8908f5e2ee178442041 (diff) | |
parent | c2a052a346d5104c3657343a885255d4d7179c75 (diff) | |
download | pleroma-4695bdd81bf9d2caed4337473d35ba021527e8a8.tar.gz pleroma-4695bdd81bf9d2caed4337473d35ba021527e8a8.zip |
Merge branch 'develop' into issue/1790-updated-oban
Diffstat (limited to 'test/web/masto_fe_controller_test.exs')
-rw-r--r-- | test/web/masto_fe_controller_test.exs | 2 |
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 |