FIX: Mailing list mode was not checking for user deleted posts
This commit is contained in:
parent
1023191315
commit
17b6d3a2fe
|
@ -4,13 +4,10 @@ module Jobs
|
||||||
|
|
||||||
def execute(args)
|
def execute(args)
|
||||||
post_id = args[:post_id]
|
post_id = args[:post_id]
|
||||||
if post_id
|
post = post_id ? Post.with_deleted.find_by(id: post_id) : nil
|
||||||
post = Post.with_deleted.find_by(id: post_id)
|
|
||||||
# our topic can be deleted as well
|
|
||||||
return if (post && post.trashed?) || !post.topic
|
|
||||||
end
|
|
||||||
|
|
||||||
raise Discourse::InvalidParameters.new(:post_id) unless post
|
raise Discourse::InvalidParameters.new(:post_id) unless post
|
||||||
|
return if post.trashed? || post.user_deleted? || (!post.topic)
|
||||||
|
|
||||||
users =
|
users =
|
||||||
User.activated.not_blocked.not_suspended.real
|
User.activated.not_blocked.not_suspended.real
|
||||||
|
|
|
@ -0,0 +1,60 @@
|
||||||
|
require "spec_helper"
|
||||||
|
|
||||||
|
describe Jobs::NotifyMailingListSubscribers do
|
||||||
|
|
||||||
|
context "with mailing list on" do
|
||||||
|
let(:user) { Fabricate(:user, mailing_list_mode: true) }
|
||||||
|
|
||||||
|
context "with a valid post" do
|
||||||
|
let!(:post) { Fabricate(:post, user: user) }
|
||||||
|
|
||||||
|
it "sends the email to the user" do
|
||||||
|
UserNotifications.expects(:mailing_list_notify).with(user, post).once
|
||||||
|
Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "with a deleted post" do
|
||||||
|
let!(:post) { Fabricate(:post, user: user, deleted_at: Time.now) }
|
||||||
|
|
||||||
|
it "doesn't send the email to the user" do
|
||||||
|
UserNotifications.expects(:mailing_list_notify).with(user, post).never
|
||||||
|
Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "with a user_deleted post" do
|
||||||
|
let!(:post) { Fabricate(:post, user: user, user_deleted: true) }
|
||||||
|
|
||||||
|
it "doesn't send the email to the user" do
|
||||||
|
UserNotifications.expects(:mailing_list_notify).with(user, post).never
|
||||||
|
Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "with a deleted topic" do
|
||||||
|
let!(:post) { Fabricate(:post, user: user) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
post.topic.update_column(:deleted_at, Time.now)
|
||||||
|
end
|
||||||
|
|
||||||
|
it "doesn't send the email to the user" do
|
||||||
|
UserNotifications.expects(:mailing_list_notify).with(user, post).never
|
||||||
|
Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
context "with mailing list off" do
|
||||||
|
let(:user) { Fabricate(:user, mailing_list_mode: false) }
|
||||||
|
let!(:post) { Fabricate(:post, user: user) }
|
||||||
|
|
||||||
|
it "doesn't send the email to the user" do
|
||||||
|
UserNotifications.expects(:mailing_list_notify).never
|
||||||
|
Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
Loading…
Reference in New Issue