diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-06-30 20:51:10 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-06-30 20:51:10 +0000 |
| commit | 9cf4bfcd818b9631e4352cc30236ef541662c86b (patch) | |
| tree | c24ef3e7627acdfe87dab018de7c3bc794c8d666 /test | |
| parent | b9e6ad571ac5925431466d6e6b27c0b372bb7727 (diff) | |
| parent | d69af7f74290a67c9201782b7d4bafa29b6e0bd8 (diff) | |
| download | pleroma-9cf4bfcd818b9631e4352cc30236ef541662c86b.tar.gz pleroma-9cf4bfcd818b9631e4352cc30236ef541662c86b.zip | |
Merge branch 'chore/rename-user-settings-column' into 'develop'
Rename user.settings column
See merge request pleroma/pleroma!2707
Diffstat (limited to 'test')
| -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 |