summaryrefslogtreecommitdiff
path: root/test/web/masto_fe_controller_test.exs
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-10-24 14:42:14 +0700
committerEgor Kislitsyn <egor@kislitsyn.com>2019-10-24 14:55:36 +0700
commit4c1dd55c48f80f3ebdb26d1a0c1a75b7922f578c (patch)
treef296a9b23362e59daf1eac6b669886be8dab1576 /test/web/masto_fe_controller_test.exs
parent478f0883eb994c639923b7b27259a02bcef8708c (diff)
parent17c237ba808d4356bb1e202e459680563b79ef99 (diff)
downloadpleroma-4c1dd55c48f80f3ebdb26d1a0c1a75b7922f578c.tar.gz
pleroma-4c1dd55c48f80f3ebdb26d1a0c1a75b7922f578c.zip
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
Diffstat (limited to 'test/web/masto_fe_controller_test.exs')
-rw-r--r--test/web/masto_fe_controller_test.exs2
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