Skip to content

Commit

Permalink
Merge pull request #375 from doubleunion/scholarship-email-improvement
Browse files Browse the repository at this point in the history
Add user and text to scholarship email
  • Loading branch information
compwron authored Sep 30, 2019
2 parents b31565e + a1318f4 commit 27f40e1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/mailers/dues_mailer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions app/views/dues_mailer/scholarship_requested.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ([email protected]) 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/
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/members/dues_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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(["[email protected]"])
expect(ActionMailer::Base.deliveries.last.to).to eq(["[email protected]", member.email])
expect(ActionMailer::Base.deliveries.last.body).to include "Lemurs are pretty great"
end
end
Expand Down

0 comments on commit 27f40e1

Please sign in to comment.