From 38815ccf07d0ad263e8324ae6da9002f5185e039 Mon Sep 17 00:00:00 2001 From: Linda Date: Sun, 11 Aug 2019 12:11:30 -0700 Subject: [PATCH 1/2] Add user and text to scholarship email --- app/mailers/dues_mailer.rb | 2 +- app/views/dues_mailer/scholarship_requested.html.haml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/mailers/dues_mailer.rb b/app/mailers/dues_mailer.rb index b3709f6b..34f915d8 100644 --- a/app/mailers/dues_mailer.rb +++ b/app/mailers/dues_mailer.rb @@ -13,7 +13,7 @@ def scholarship_requested(user, reason) @reason = reason mail( - to: [SCHOLARSHIP_EMAIL], + to: [SCHOLARSHIP_EMAIL, @user.email], subject: "New DU Scholarship Request", ) end diff --git a/app/views/dues_mailer/scholarship_requested.html.haml b/app/views/dues_mailer/scholarship_requested.html.haml index dd39348b..0f8b62a3 100644 --- a/app/views/dues_mailer/scholarship_requested.html.haml +++ b/app/views/dues_mailer/scholarship_requested.html.haml @@ -10,6 +10,9 @@ %p Please go to the app and approve or deny this person's scholarship, then email them to let them know. Please also notify the membership coordinator (membership@doubleunion.org) that the person is on the scholarship list, so they can make sure the person's scholarship status is reflected in the membership management system (such as setting them up with Google Drive and Calendar if they're a brand-new member). +%p + Scholarship requests should be responded to within two weeks. + %p Yours Truly, %br/ From a1318f4b7ca842f2df49586c3d7b00d58095af17 Mon Sep 17 00:00:00 2001 From: Linda Date: Sun, 29 Sep 2019 15:45:08 -0700 Subject: [PATCH 2/2] Test fix --- spec/controllers/members/dues_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/members/dues_controller_spec.rb b/spec/controllers/members/dues_controller_spec.rb index 5b395837..b792b08c 100644 --- a/spec/controllers/members/dues_controller_spec.rb +++ b/spec/controllers/members/dues_controller_spec.rb @@ -190,7 +190,7 @@ it "sends an email" do expect { subject }.to change { ActionMailer::Base.deliveries.count }.by(1) - expect(ActionMailer::Base.deliveries.last.to).to eq(["scholarship@doubleunion.org"]) + expect(ActionMailer::Base.deliveries.last.to).to eq(["scholarship@doubleunion.org", member.email]) expect(ActionMailer::Base.deliveries.last.body).to include "Lemurs are pretty great" end end