Co-authored-by: Anna Anks Nowak <matisnape@users.noreply.github.com>
This commit is contained in:
parent
52cf81624e
commit
1ca6f56cce
2 changed files with 5 additions and 4 deletions
|
|
@ -206,6 +206,8 @@ class User < ApplicationRecord
|
|||
|
||||
alias_attribute :public_reactions_count, :reactions_count
|
||||
alias_attribute :subscribed_to_welcome_notifications?, :welcome_notifications
|
||||
alias_attribute :subscribed_to_mod_roundrobin_notifications?, :mod_roundrobin_notifications
|
||||
alias_attribute :subscribed_to_email_follower_notifications?, :email_follower_notifications
|
||||
|
||||
scope :eager_load_serialized_data, -> { includes(:roles) }
|
||||
scope :registered, -> { where(registered: true) }
|
||||
|
|
@ -471,8 +473,7 @@ class User < ApplicationRecord
|
|||
end
|
||||
|
||||
def receives_follower_email_notifications?
|
||||
email.present? &&
|
||||
email_follower_notifications
|
||||
email.present? && subscribed_to_email_follower_notifications?
|
||||
end
|
||||
|
||||
def hotness_score
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ RSpec.describe "UserSettings", type: :request do
|
|||
|
||||
it "enables community-success notifications" do
|
||||
put "/users/#{user.id}", params: { user: { tab: "notifications", mod_roundrobin_notifications: 1 } }
|
||||
expect(user.reload.mod_roundrobin_notifications).to be(true)
|
||||
expect(user.reload.subscribed_to_mod_roundrobin_notifications?).to be(true)
|
||||
end
|
||||
|
||||
it "updates the users announcement display preferences" do
|
||||
|
|
@ -183,7 +183,7 @@ RSpec.describe "UserSettings", type: :request do
|
|||
|
||||
it "disables community-success notifications" do
|
||||
put "/users/#{user.id}", params: { user: { tab: "notifications", mod_roundrobin_notifications: 0 } }
|
||||
expect(user.reload.mod_roundrobin_notifications).to be(false)
|
||||
expect(user.reload.subscribed_to_mod_roundrobin_notifications?).to be(false)
|
||||
end
|
||||
|
||||
it "can toggle welcome notifications" do
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue