From 5e402c64eadd66d40b5a670e4469862b8890378b Mon Sep 17 00:00:00 2001 From: Kelly Pederson Date: Mon, 1 Feb 2016 12:01:22 -0700 Subject: [PATCH 1/4] To address shown in all mailers except CommentNotificationMailer --- app/controllers/reviewer/proposals_controller.rb | 1 + app/mailers/comment_notification_mailer.rb | 3 ++- app/mailers/organizer/proposal_mailer.rb | 8 ++++---- app/mailers/proposal_mailer.rb | 7 ++++--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/controllers/reviewer/proposals_controller.rb b/app/controllers/reviewer/proposals_controller.rb index b2898ae11..476e9c5bc 100644 --- a/app/controllers/reviewer/proposals_controller.rb +++ b/app/controllers/reviewer/proposals_controller.rb @@ -4,6 +4,7 @@ class Reviewer::ProposalsController < Reviewer::ApplicationController decorates_assigned :proposal, with: Reviewer::ProposalDecorator + def index proposal_ids = current_user.proposals.pluck(:id) diff --git a/app/mailers/comment_notification_mailer.rb b/app/mailers/comment_notification_mailer.rb index 7eab56be2..ddd43ae73 100644 --- a/app/mailers/comment_notification_mailer.rb +++ b/app/mailers/comment_notification_mailer.rb @@ -12,7 +12,8 @@ def email_notification(comment) end.compact if bcc.any? - mail_markdown(bcc: bcc, + mail_markdown( + bcc: bcc, from: @proposal.event.contact_email, subject: "CFP #{@proposal.event.name}: A comment has been posted on '#{@proposal.title}'") end diff --git a/app/mailers/organizer/proposal_mailer.rb b/app/mailers/organizer/proposal_mailer.rb index 49555025f..4ebac2e18 100644 --- a/app/mailers/organizer/proposal_mailer.rb +++ b/app/mailers/organizer/proposal_mailer.rb @@ -27,12 +27,12 @@ def waitlist_email(event, proposal) private def mail_to_speakers(event, proposal, subject) - bcc = proposal.speakers.map(&:email) - if bcc.any? - bcc << event.contact_email + to = proposal.speakers.map(&:email) + if to.any? mail_markdown( from: event.contact_email, - bcc: bcc, + to: to, + bcc: event.contact_email, subject: subject ) end diff --git a/app/mailers/proposal_mailer.rb b/app/mailers/proposal_mailer.rb index a8de9980f..75793b9c2 100644 --- a/app/mailers/proposal_mailer.rb +++ b/app/mailers/proposal_mailer.rb @@ -8,9 +8,10 @@ def comment_notification(proposal, comment) end if bcc.any? - mail_markdown(bcc: bcc, - from: @proposal.event.contact_email, - subject: "CFP #{@proposal.event.name}: You've received a comment on your proposal '#{@proposal.title}'") + mail_markdown(to: @proposal.speakers.map(&:email), + bcc: bcc, + from: @proposal.event.contact_email, + subject: "CFP #{@proposal.event.name}: You've received a comment on your proposal '#{@proposal.title}'") end end end From 90e5f248e7ba78459e61800cfc64871e71175081 Mon Sep 17 00:00:00 2001 From: Kelly Pederson Date: Mon, 1 Feb 2016 12:12:48 -0700 Subject: [PATCH 2/4] Fixed broken specs --- spec/features/organizer/proposals_spec.rb | 6 +++--- spec/mailers/organizer/proposal_mailer_spec.rb | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spec/features/organizer/proposals_spec.rb b/spec/features/organizer/proposals_spec.rb index ad317da00..7056715e9 100644 --- a/spec/features/organizer/proposals_spec.rb +++ b/spec/features/organizer/proposals_spec.rb @@ -101,7 +101,7 @@ end it "sends an email notification to the speaker" do - expect(ActionMailer::Base.deliveries.last.bcc).to include(speaker_person.email) + expect(ActionMailer::Base.deliveries.last.to).to include(speaker_person.email) end end @@ -117,7 +117,7 @@ end it "sends an email notification to the speaker" do - expect(ActionMailer::Base.deliveries.last.bcc).to include(speaker_person.email) + expect(ActionMailer::Base.deliveries.last.to).to include(speaker_person.email) end end @@ -133,7 +133,7 @@ end it "sends an email notification to the speaker" do - expect(ActionMailer::Base.deliveries.last.bcc).to include(speaker_person.email) + expect(ActionMailer::Base.deliveries.last.to).to include(speaker_person.email) end end diff --git a/spec/mailers/organizer/proposal_mailer_spec.rb b/spec/mailers/organizer/proposal_mailer_spec.rb index ee9cd7de1..35783fe6f 100644 --- a/spec/mailers/organizer/proposal_mailer_spec.rb +++ b/spec/mailers/organizer/proposal_mailer_spec.rb @@ -12,11 +12,11 @@ describe "accept_email" do let(:mail) { Organizer::ProposalMailer.accept_email(event, proposal) } - it "bccs to all speakers including contact_mail" do + it "emails to all speakers including contact_mail" do proposal.speakers = build_list(:speaker, 3) proposal.save! - expect(mail.bcc.count).to eq(4) - bcc_emails = proposal.speakers.map(&:email) << event.contact_email + expect(mail.to.count).to eq(3) + bcc_emails = event.contact_email expect(mail.bcc).to match_array(bcc_emails) end @@ -44,8 +44,8 @@ it "bccs to all speakers including contact_mail" do proposal.speakers = build_list(:speaker, 3) proposal.save! - expect(mail.bcc.count).to eq(4) - bcc_emails = proposal.speakers.map(&:email) << event.contact_email + expect(mail.to.count).to eq(3) + bcc_emails = event.contact_email expect(mail.bcc).to match_array(bcc_emails) end @@ -68,8 +68,8 @@ it "bccs to all speakers including contact_mail" do proposal.speakers = build_list(:speaker, 3) proposal.save! - expect(mail.bcc.count).to eq(4) - bcc_emails = proposal.speakers.map(&:email) << event.contact_email + expect(mail.to.count).to eq(3) + bcc_emails = event.contact_email expect(mail.bcc).to match_array(bcc_emails) end From f5d6470fd8f334aa21d8753386627e647a52e4b5 Mon Sep 17 00:00:00 2001 From: Kelly Pederson Date: Mon, 1 Feb 2016 13:33:01 -0700 Subject: [PATCH 3/4] Got rid of bcc on proposal mailer --- app/mailers/proposal_mailer.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/mailers/proposal_mailer.rb b/app/mailers/proposal_mailer.rb index 75793b9c2..c5021c05f 100644 --- a/app/mailers/proposal_mailer.rb +++ b/app/mailers/proposal_mailer.rb @@ -3,13 +3,12 @@ def comment_notification(proposal, comment) @proposal = proposal @comment = comment - bcc = @proposal.speakers.map do |speaker| + to = @proposal.speakers.map do |speaker| speaker.email if speaker.person != @comment.person end - if bcc.any? + if to.any? mail_markdown(to: @proposal.speakers.map(&:email), - bcc: bcc, from: @proposal.event.contact_email, subject: "CFP #{@proposal.event.name}: You've received a comment on your proposal '#{@proposal.title}'") end From 446b4156141675fa91bf649eade0a627fe539498 Mon Sep 17 00:00:00 2001 From: Kelly Pederson Date: Mon, 1 Feb 2016 14:32:07 -0700 Subject: [PATCH 4/4] Changed bcc emails to to and fixed specs --- app/mailers/proposal_mailer.rb | 2 +- spec/controllers/comments_controller_spec.rb | 2 +- spec/mailers/proposal_mailer_spec.rb | 8 ++++---- spec/models/public_comment_spec.rb | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/mailers/proposal_mailer.rb b/app/mailers/proposal_mailer.rb index c5021c05f..dea6727dd 100644 --- a/app/mailers/proposal_mailer.rb +++ b/app/mailers/proposal_mailer.rb @@ -8,7 +8,7 @@ def comment_notification(proposal, comment) end if to.any? - mail_markdown(to: @proposal.speakers.map(&:email), + mail_markdown(to: to, from: @proposal.event.contact_email, subject: "CFP #{@proposal.event.name}: You've received a comment on your proposal '#{@proposal.title}'") end diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb index d3921b614..bb971dcd9 100644 --- a/spec/controllers/comments_controller_spec.rb +++ b/spec/controllers/comments_controller_spec.rb @@ -50,7 +50,7 @@ }.to change(ActionMailer::Base.deliveries, :count).by(1) email = ActionMailer::Base.deliveries.last - expect(email.bcc).to match_array(speakers.map(&:email)) + expect(email.to).to match_array(speakers.map(&:email)) end end diff --git a/spec/mailers/proposal_mailer_spec.rb b/spec/mailers/proposal_mailer_spec.rb index 89ec1a21f..121b125ed 100644 --- a/spec/mailers/proposal_mailer_spec.rb +++ b/spec/mailers/proposal_mailer_spec.rb @@ -10,8 +10,8 @@ it "bccs to all speakers" do proposal.speakers = build_list(:speaker, 3) proposal.save! - expect(mail.bcc.count).to eq(3) - expect(mail.bcc).to match_array(proposal.speakers.map(&:email)) + expect(mail.to.count).to eq(3) + expect(mail.to).to match_array(proposal.speakers.map(&:email)) end it "doesn't bcc the speaker if they are also the commenter" do @@ -19,8 +19,8 @@ proposal.save! proposal.speakers << build(:speaker, person: person) expect(proposal.speakers.count).to eq(4) - expect(mail.bcc.count).to eq(3) - expect(mail.bcc).to match_array(proposal.speakers.first(3).map(&:email)) + expect(mail.to.count).to eq(3) + expect(mail.to).to match_array(proposal.speakers.first(3).map(&:email)) end end diff --git a/spec/models/public_comment_spec.rb b/spec/models/public_comment_spec.rb index 39ece39d9..4d176e30b 100644 --- a/spec/models/public_comment_spec.rb +++ b/spec/models/public_comment_spec.rb @@ -137,7 +137,7 @@ proposal.public_comments.create(attributes_for(:comment, person: reviewer)) }.to change(ActionMailer::Base.deliveries, :count).by(1) - expect(ActionMailer::Base.deliveries.last.bcc).to match_array(speakers.map(&:email)) + expect(ActionMailer::Base.deliveries.last.to).to match_array(speakers.map(&:email)) end end end