diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-07-02 13:01:22 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-07-02 13:01:22 -0500 |
| commit | 8121e46f25b2ea74bdcc635cab20bd17183bcca2 (patch) | |
| tree | cf7958401d4d7fd48e6244cd1035f5323032b85f /test/web/masto_fe_controller_test.exs | |
| parent | 02d855b2b9a4bb88f0ddd7edc9bca30b66dbf241 (diff) | |
| parent | 4c044f62258b33a95b8281e1eb42a5e0ce47d42d (diff) | |
| download | pleroma-8121e46f25b2ea74bdcc635cab20bd17183bcca2.tar.gz pleroma-8121e46f25b2ea74bdcc635cab20bd17183bcca2.zip | |
Merge branch 'develop' into activation-meta
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 |