diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-07-13 13:32:21 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-07-13 13:32:21 -0500 |
| commit | 80c21100db306ce45856bbdb97d3439676babeeb (patch) | |
| tree | d143f523da262df5176220fbe6dc0b6370c91ebc /test/web/masto_fe_controller_test.exs | |
| parent | ce85db41a30d95555bbd44d8931c4a3a357938d8 (diff) | |
| parent | 5d215fd81f529b639db9096ca71d4e7f0a6ed386 (diff) | |
| download | pleroma-80c21100db306ce45856bbdb97d3439676babeeb.tar.gz pleroma-80c21100db306ce45856bbdb97d3439676babeeb.zip | |
Merge branch 'develop' into refactor/notification_settings
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 |