diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-19 20:05:37 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-19 20:05:37 +0300 |
commit | bdf57b8ef438f32999ef917777b13161320644a8 (patch) | |
tree | b72dc8ce2621eeb25e14504d6ce73c6657fac571 /test/user/notification_setting_test.exs | |
parent | 9faa63203717e71d666afb6755ff0b781b491823 (diff) | |
parent | f0d13fc3f7d0e9b58cfe1cd8918072d45d656a31 (diff) | |
download | pleroma-bdf57b8ef438f32999ef917777b13161320644a8.tar.gz pleroma-bdf57b8ef438f32999ef917777b13161320644a8.zip |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# mix.lock
# test/web/media_proxy/media_proxy_test.exs
Diffstat (limited to 'test/user/notification_setting_test.exs')
-rw-r--r-- | test/user/notification_setting_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/user/notification_setting_test.exs b/test/user/notification_setting_test.exs index 95bca22c4..308da216a 100644 --- a/test/user/notification_setting_test.exs +++ b/test/user/notification_setting_test.exs @@ -8,11 +8,11 @@ defmodule Pleroma.User.NotificationSettingTest do alias Pleroma.User.NotificationSetting describe "changeset/2" do - test "sets valid privacy option" do + test "sets option to hide notification contents" do changeset = NotificationSetting.changeset( %NotificationSetting{}, - %{"privacy_option" => true} + %{"hide_notification_contents" => true} ) assert %Ecto.Changeset{valid?: true} = changeset |