Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jw expanding email spec coverage #57

Merged
merged 12 commits into from
Feb 7, 2017
Merged

Jw expanding email spec coverage #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a86151e
expanding coverage for obtain_research_pricing action on SR controller
jwiel86 Jan 24, 2017
12f4d84
started expanding spec coverage for confirmation action in SR controller
jwiel86 Jan 24, 2017
ee54f59
.
jwiel86 Jan 27, 2017
f03fd72
Merge branch 'master' into jw_expanding_email_spec_coverage
jwiel86 Jan 27, 2017
492b65e
added specs to cover several problematic scenarios in the past
jwiel86 Jan 31, 2017
1688cd8
fixing broken specs
jwiel86 Feb 1, 2017
3e84d57
spec fix
jwiel86 Feb 1, 2017
859db39
added a few more scenarios for confirmation method on SR controller
jwiel86 Feb 1, 2017
ad2173f
adding admin email spec coverage to remove service method on SR contr…
jwiel86 Feb 2, 2017
a7c1ab0
added coverage for admin emails upon ssr deletion
jwiel86 Feb 2, 2017
6ef146a
cleaning up remove service specs
jwiel86 Feb 3, 2017
2d448a3
cleaning up confirmation specs for SR controller
jwiel86 Feb 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/notifier_logic.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ def send_user_notifications(request_amendment: false)
else
approval = false
end

# send e-mail to all folks with view and above
@service_request.protocol.project_roles.each do |project_role|
next if project_role.project_rights == 'none' || project_role.identity.email.blank?
Expand Down Expand Up @@ -200,8 +199,8 @@ def send_individual_service_provider_notification(sub_service_request, service_p
request_for_grant_billing_form = RequestGrantBillingPdf.generate_pdf service_request
attachments["request_for_grant_billing_#{sub_service_request.service_request.id}.pdf"] = request_for_grant_billing_form
end

ssr_id = sub_service_request.id

Notifier.notify_service_provider(service_provider, @service_request, attachments, @current_user, ssr_id, audit_report, ssr_destroyed, request_amendment).deliver_now
end

Expand Down