diff options
| author | lain <lain@soykaf.club> | 2020-07-06 12:07:56 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-06 12:07:56 +0200 |
| commit | ed4f9f6a29d8cf2dd31e41bae7e63aaa15bc9548 (patch) | |
| tree | 82c5e8b4a40495485533b9c95668cef39ce909d2 /test/web/masto_fe_controller_test.exs | |
| parent | a5bbfa21a1fabe97bfff1cc80348d2944319f3ad (diff) | |
| parent | 69f0b286f7b3e0518ac7ae54dfb06539dc179698 (diff) | |
| download | pleroma-ed4f9f6a29d8cf2dd31e41bae7e63aaa15bc9548.tar.gz pleroma-ed4f9f6a29d8cf2dd31e41bae7e63aaa15bc9548.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json
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 |