diff options
author | lain <lain@soykaf.club> | 2020-07-06 12:15:59 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-07-06 12:15:59 +0200 |
commit | 1963e143c5feace9eb9a3be29b0eeba2ad88751a (patch) | |
tree | 9a7ae160dd452db000e33af62f61057667c5953f /test/web/masto_fe_controller_test.exs | |
parent | 67d92ac7b7b977debac8f8e580db1f0e1ef3ed52 (diff) | |
parent | 69f0b286f7b3e0518ac7ae54dfb06539dc179698 (diff) | |
download | pleroma-1963e143c5feace9eb9a3be29b0eeba2ad88751a.tar.gz pleroma-1963e143c5feace9eb9a3be29b0eeba2ad88751a.zip |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
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 |