diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2019-10-24 09:23:59 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-10-24 09:23:59 +0300 |
commit | 99cf1ef9be93ebab04d088848804369e6295a76d (patch) | |
tree | 94738e2bc0ee642db4abc4e65a9798782de59623 /test/web/masto_fe_controller_test.exs | |
parent | d3fb9e02cc0ce7dc462e587e639e117aaef5fbc5 (diff) | |
parent | 17c237ba808d4356bb1e202e459680563b79ef99 (diff) | |
download | pleroma-99cf1ef9be93ebab04d088848804369e6295a76d.tar.gz pleroma-99cf1ef9be93ebab04d088848804369e6295a76d.zip |
Merge branch 'develop' into issue/1276
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 ab9dab352..b5dbd4a25 100644 --- a/test/web/masto_fe_controller_test.exs +++ b/test/web/masto_fe_controller_test.exs @@ -23,7 +23,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.info.settings == %{"programming" => "socks"} + assert user.settings == %{"programming" => "socks"} end describe "index/2 redirections" do |