<%= link_to back_path, class: "inline-flex items-center gap-1.5 text-sm text-gray-500 hover:text-gray-700 px-2 py-1" do %>
diff --git a/app/views/people/show.html.erb b/app/views/people/show.html.erb
index d8fdc59d3b..2aaad7ddc3 100644
--- a/app/views/people/show.html.erb
+++ b/app/views/people/show.html.erb
@@ -2,8 +2,9 @@
<%# Returned from a registrant's profile link on the event registrants page. Shown
above the profile topper; needs event_id since the profile isn't event-scoped. %>
<% if params[:return_to] == "registrants" && params[:event_id].present? %>
+ <% back_registration = @person.event_registrations.find_by(event_id: params[:event_id]) %>
- <%= link_to registrants_event_path(params[:event_id]), class: "text-sm text-gray-500 hover:text-gray-700" do %>
+ <%= link_to(back_registration ? registrants_event_row_path(params[:event_id], back_registration.id) : registrants_event_path(params[:event_id]), class: "text-sm text-gray-500 hover:text-gray-700") do %>
Back to registrants
<% end %>
diff --git a/app/views/scholarships/_form.html.erb b/app/views/scholarships/_form.html.erb
index d0d58f55b6..64906d97c2 100644
--- a/app/views/scholarships/_form.html.erb
+++ b/app/views/scholarships/_form.html.erb
@@ -247,7 +247,7 @@
elsif @allocatable.respond_to?(:event) && params[:return_to] == "onboarding"
onboarding_event_row_path(@allocatable.event, @allocatable.id)
elsif @allocatable.respond_to?(:event)
- params[:return_to] == "registration" ? edit_event_registration_path(@allocatable) : registrants_event_path(@allocatable.event)
+ params[:return_to] == "registration" ? edit_event_registration_path(@allocatable) : registrants_event_row_path(@allocatable.event, @allocatable.id)
elsif grant.present?
grant_path(grant)
else
diff --git a/app/views/scholarships/edit.html.erb b/app/views/scholarships/edit.html.erb
index 4aadfe6b71..27a3311abb 100644
--- a/app/views/scholarships/edit.html.erb
+++ b/app/views/scholarships/edit.html.erb
@@ -23,7 +23,7 @@
Onboarding
<% end %>
<% elsif @allocatable.respond_to?(:event) %>
- <%= link_to registrants_event_path(@allocatable.event), class: "text-sm text-gray-500 hover:text-gray-700" do %>
+ <%= link_to registrants_event_row_path(@allocatable.event, @allocatable.id), class: "text-sm text-gray-500 hover:text-gray-700" do %>
Registrants
<% end %>
<% elsif grant.present? %>
diff --git a/app/views/scholarships/new.html.erb b/app/views/scholarships/new.html.erb
index 12b0797f1a..fa9f8ed7ac 100644
--- a/app/views/scholarships/new.html.erb
+++ b/app/views/scholarships/new.html.erb
@@ -17,7 +17,7 @@
Onboarding
<% end %>
<% elsif @allocatable.respond_to?(:event) %>
- <%= link_to registrants_event_path(@allocatable.event), class: "text-sm text-gray-500 hover:text-gray-700" do %>
+ <%= link_to registrants_event_row_path(@allocatable.event, @allocatable.id), class: "text-sm text-gray-500 hover:text-gray-700" do %>
Registrants
<% end %>
<% else %>
diff --git a/lib/domain_theme.rb b/lib/domain_theme.rb
index e291f9d101..0aeae0ad7a 100644
--- a/lib/domain_theme.rb
+++ b/lib/domain_theme.rb
@@ -30,6 +30,7 @@ module DomainTheme
banners: :yellow,
users: :rose,
+ comments: :purple,
# Event dashboard cards
payments: :green,
diff --git a/spec/models/event_registration_spec.rb b/spec/models/event_registration_spec.rb
index c330c32c41..cdc22ea13f 100644
--- a/spec/models/event_registration_spec.rb
+++ b/spec/models/event_registration_spec.rb
@@ -174,6 +174,110 @@
expect(EventRegistration.payment_status("bogus")).to include(paid_reg, unpaid_reg)
end
end
+
+ describe ".ce_status" do
+ let!(:complete_ce) do
+ create(:event_registration, event: event, ce_credit_requested: true, ce_license_number: "ABC123", ce_hours_requested: 3).tap do |r|
+ create(:allocation, source: create(:payment, amount_cents: event.cost_cents, amount_cents_remaining: event.cost_cents),
+ allocatable: r, amount: event.cost_cents)
+ end
+ end
+ let!(:missing_ce) { create(:event_registration, event: event, ce_credit_requested: true) }
+ let!(:no_ce) { create(:event_registration, event: event, ce_credit_requested: false) }
+
+ it "maps 'requested' to anyone who asked for CE credit" do
+ results = EventRegistration.ce_status("requested")
+ expect(results).to include(complete_ce, missing_ce)
+ expect(results).not_to include(no_ce)
+ end
+
+ it "maps 'license_not_provided' to CE requests missing a license number" do
+ results = EventRegistration.ce_status("license_not_provided")
+ expect(results).to include(missing_ce)
+ expect(results).not_to include(complete_ce, no_ce)
+ end
+
+ it "maps 'hours_not_provided' to CE requests missing hours" do
+ results = EventRegistration.ce_status("hours_not_provided")
+ expect(results).to include(missing_ce)
+ expect(results).not_to include(complete_ce, no_ce)
+ end
+
+ it "maps 'paid' to CE requests that are paid in full" do
+ results = EventRegistration.ce_status("paid")
+ expect(results).to include(complete_ce)
+ expect(results).not_to include(missing_ce, no_ce)
+ end
+
+ it "returns an unfiltered relation for unknown values" do
+ expect(EventRegistration.ce_status("bogus")).to include(complete_ce, missing_ce, no_ce)
+ end
+ end
+
+ describe ".comment_status" do
+ let!(:no_comment) { create(:event_registration, event: event) }
+ let!(:commented) { create(:event_registration, event: event).tap { |r| create(:comment, commentable: r, body: "Hi") } }
+ let!(:flagged) { create(:event_registration, event: event).tap { |r| create(:comment, commentable: r, body: "Flag", flagged: true) } }
+
+ it "maps 'none' to registrations without comments" do
+ results = EventRegistration.comment_status("none")
+ expect(results).to include(no_comment)
+ expect(results).not_to include(commented, flagged)
+ end
+
+ it "maps 'present' to registrations with any comment" do
+ results = EventRegistration.comment_status("present")
+ expect(results).to include(commented, flagged)
+ expect(results).not_to include(no_comment)
+ end
+
+ it "maps 'flagged' to registrations with a flagged comment" do
+ results = EventRegistration.comment_status("flagged")
+ expect(results).to include(flagged)
+ expect(results).not_to include(no_comment, commented)
+ end
+
+ it "returns an unfiltered relation for unknown values" do
+ expect(EventRegistration.comment_status("bogus")).to include(no_comment, commented, flagged)
+ end
+ end
+
+ describe ".account_status" do
+ # The person factory auto-builds a confirmed user, so each case sets the
+ # registrant's account state explicitly (user: nil for no account).
+ let!(:none_reg) { create(:event_registration, event: event, registrant: create(:person, user: nil)) }
+ let!(:access_reg) { create(:event_registration, event: event, registrant: create(:person, user: create(:user, confirmed_at: Time.current))) }
+ let!(:invited_reg) { create(:event_registration, event: event, registrant: create(:person, user: create(:user, confirmed_at: nil, welcome_instructions_sent_at: Time.current))) }
+ let!(:no_access_reg) { create(:event_registration, event: event, registrant: create(:person, user: create(:user, confirmed_at: nil, welcome_instructions_sent_at: nil))) }
+
+ it "maps 'none' to registrants without an account" do
+ results = EventRegistration.account_status("none")
+ expect(results).to include(none_reg)
+ expect(results).not_to include(access_reg, invited_reg, no_access_reg)
+ end
+
+ it "maps 'has_access' to confirmed, unlocked, active accounts" do
+ results = EventRegistration.account_status("has_access")
+ expect(results).to include(access_reg)
+ expect(results).not_to include(none_reg, invited_reg, no_access_reg)
+ end
+
+ it "maps 'invited' to invited accounts that don't yet have access" do
+ results = EventRegistration.account_status("invited")
+ expect(results).to include(invited_reg)
+ expect(results).not_to include(none_reg, access_reg, no_access_reg)
+ end
+
+ it "maps 'no_access' to accounts that are neither invited nor active" do
+ results = EventRegistration.account_status("no_access")
+ expect(results).to include(no_access_reg)
+ expect(results).not_to include(none_reg, access_reg, invited_reg)
+ end
+
+ it "returns an unfiltered relation for unknown values" do
+ expect(EventRegistration.account_status("bogus")).to include(none_reg, access_reg, invited_reg, no_access_reg)
+ end
+ end
end
describe "#scholarship?" do
diff --git a/spec/requests/allocations_spec.rb b/spec/requests/allocations_spec.rb
index c9526db426..75c26faca5 100644
--- a/spec/requests/allocations_spec.rb
+++ b/spec/requests/allocations_spec.rb
@@ -30,10 +30,10 @@
expect(response).to have_http_status(:success)
end
- it "links the back link to the registrants roster when return_to=registrants" do
+ it "links the back link to the registrants roster (anchored to the row) when return_to=registrants" do
get allocations_path(allocatable_sgid: reg.to_sgid.to_s, return_to: "registrants")
- expect(response.body).to include("href=\"#{registrants_event_path(event)}\"")
+ expect(response.body).to include("href=\"#{registrants_event_path(event, highlight: reg.id, anchor: "registrant-row-#{reg.id}")}\"")
end
it "links the back link to bulk payments, re-expanding the submission row, when return_to=bulk_payments" do
diff --git a/spec/requests/events/public_registrations_spec.rb b/spec/requests/events/public_registrations_spec.rb
index 54f27f45e5..8d3ea427af 100644
--- a/spec/requests/events/public_registrations_spec.rb
+++ b/spec/requests/events/public_registrations_spec.rb
@@ -673,5 +673,22 @@ def post_with_scholarship(scholarship_answer)
expect(response.body).not_to include("Back to linked organizations")
end
end
+
+ context "when viewed from the admin registrants roster" do
+ let(:admin) { create(:user, :admin) }
+ let!(:registration) { create(:event_registration, event: event, registrant: person) }
+
+ before { sign_in admin }
+
+ it "returns the eyebrow to the registrant's row instead of the ticket" do
+ get event_public_registration_path(event, person_id: person.id,
+ return_to: "registrants", return_registration_id: registration.id)
+
+ expect(response.body).to include("Back to registrants")
+ expect(response.body).to include("registrant-row-#{registration.id}")
+ expect(response.body).to include("highlight=#{registration.id}")
+ expect(response.body).not_to include("Back to ticket")
+ end
+ end
end
end
diff --git a/spec/requests/events_spec.rb b/spec/requests/events_spec.rb
index cf0f8e177d..9f879ce72c 100644
--- a/spec/requests/events_spec.rb
+++ b/spec/requests/events_spec.rb
@@ -5,6 +5,13 @@
let(:admin) { create(:user, :admin) }
let(:event) { create(:event) }
+ # Makes the event CE-eligible (offers a positive number of CE hours), which
+ # gates every CE column/filter/export.
+ def offer_ce!(target_event)
+ target_event.update!(ce_hours_offered: 6)
+ target_event
+ end
+
let(:valid_params) do
{
event: {
@@ -555,6 +562,13 @@
context "organization column" do
let(:organization) { create(:organization, name: "Helping Hands") }
+ # Scopes assertions to the registrant's org cell so generic words like
+ # "None" in unrelated filter dropdowns don't cause false matches.
+ def org_cell_text
+ Nokogiri::HTML(response.body)
+ .at_css("tr#registrant-row-#{registration.id} td[data-column-toggle-col='organization']")&.text&.squish
+ end
+
# Stores a submitted "agency_name" answer for the registrant, mirroring what
# public registration captures, so the Pending/None chip logic has data.
def submit_agency_name(name)
@@ -580,15 +594,15 @@ def submit_agency_name(name)
get registrants_event_path(event)
- expect(response.body).to include(">Pending<")
- expect(response.body).not_to include(">None<")
+ expect(org_cell_text).to include("Pending")
+ expect(org_cell_text).not_to include("None")
end
it "shows a 'None' chip when a registrant has no linked org and submitted nothing" do
get registrants_event_path(event)
- expect(response.body).to include(">None<")
- expect(response.body).not_to include(">Pending<")
+ expect(org_cell_text).to include("None")
+ expect(org_cell_text).not_to include("Pending")
end
it "does not show a 'Pending' chip when an org is linked, even if the submitted name differs" do
@@ -597,8 +611,8 @@ def submit_agency_name(name)
get registrants_event_path(event)
- expect(response.body).to include(organization.name)
- expect(response.body).not_to include(">Pending<")
+ expect(org_cell_text).to include(organization.name)
+ expect(org_cell_text).not_to include("Pending")
end
it "does not show 'Pending' when the submitted name matches a linked org" do
@@ -607,8 +621,8 @@ def submit_agency_name(name)
get registrants_event_path(event)
- expect(response.body).to include(organization.name)
- expect(response.body).not_to include(">Pending<")
+ expect(org_cell_text).to include(organization.name)
+ expect(org_cell_text).not_to include("Pending")
end
end
@@ -683,7 +697,6 @@ def submit_agency_name(name)
it "shows the due amount and no paid amount when nothing has been paid" do
get registrants_event_path(event)
- expect(response.body).to include("fa-circle-exclamation")
expect(response.body).to include("$10 due")
expect(response.body).not_to include("Partial")
end
@@ -694,7 +707,6 @@ def submit_agency_name(name)
get registrants_event_path(event)
- expect(response.body).to include("fa-circle-half-stroke")
expect(response.body).to include("Partial payment · $6 due")
expect(response.body).not_to include(">Partial payment<")
expect(response.body).to include("$6 due")
@@ -706,7 +718,6 @@ def submit_agency_name(name)
get registrants_event_path(event)
- expect(response.body).to include("fa-circle-exclamation")
expect(response.body).to include("$6 due")
expect(response.body).not_to include("Partial")
end
@@ -717,7 +728,6 @@ def submit_agency_name(name)
get registrants_event_path(event)
- expect(response.body).to include("fa-circle-check")
expect(response.body).to include(">Paid")
end
@@ -747,23 +757,25 @@ def submit_agency_name(name)
context "registration form icon" do
let(:reg_form) { create(:form, :standalone, name: "Registration Form") }
- it "shows green icon when person submitted the current registration form" do
+ it "shows a blue outline form icon when person submitted the current registration form" do
create(:event_form, event: event, form: reg_form, role: "registration")
create(:form_submission, person: person, form: reg_form)
get registrants_event_path(event)
expect(response).to have_http_status(:ok)
- expect(response.body).to include('fa-solid fa-file-lines')
+ expect(response.body).to include('fa-regular fa-file-lines')
+ expect(response.body).to include('text-blue-600')
end
- it "shows gray icon when person has not submitted any form" do
+ it "reserves an empty slot (no icon) when person has not submitted, keeping later icons aligned" do
create(:event_form, event: event, form: reg_form, role: "registration")
get registrants_event_path(event)
expect(response).to have_http_status(:ok)
- expect(response.body).to include('fa-regular fa-file-lines')
+ expect(response.body).not_to include('fa-file-lines')
+ expect(response.body).to include('inline-flex w-4 justify-center')
end
it "does not show any form icon when event has no forms" do
@@ -838,6 +850,137 @@ def submit_agency_name(name)
end
end
+ describe "GET /events/:id/registrants with the CE status filter" do
+ let(:event) { create(:event, cost_cents: 1_000) }
+ let(:complete_person) { create(:person, first_name: "Complete", last_name: "Person") }
+ let(:missing_person) { create(:person, first_name: "Missing", last_name: "Person") }
+ let(:none_person) { create(:person, first_name: "Noce", last_name: "Person") }
+
+ let!(:complete_reg) do
+ reg = create(:event_registration, event: event, registrant: complete_person,
+ ce_credit_requested: true, ce_license_number: "ABC123", ce_hours_requested: 3)
+ create(:allocation, source: create(:payment, amount_cents: 1_000, amount_cents_remaining: 1_000),
+ allocatable: reg, amount: 1_000)
+ reg
+ end
+ let!(:missing_reg) { create(:event_registration, event: event, registrant: missing_person, ce_credit_requested: true) }
+ let!(:none_reg) { create(:event_registration, event: event, registrant: none_person, ce_credit_requested: false) }
+
+ before do
+ offer_ce!(event)
+ sign_in admin
+ end
+
+ it "shows the CE status column and filter when the event offers CE" do
+ get registrants_event_path(event)
+ expect(response.body).to include("CE status")
+ expect(response.body).to include('data-column-toggle-group-value="ce"')
+ end
+
+ it "renders the CE status column on by default, with a toggle to hide it" do
+ get registrants_event_path(event)
+ # CE column markers render visible (no `hidden` class) since the toggle defaults on…
+ expect(response.body).to include('data-column-toggle-col="ce"')
+ expect(response.body).not_to match(/class="[^"]*\bhidden\b[^"]*"[^>]*data-column-toggle-col="ce"/)
+ # …and the toggle switch shows its on-state.
+ expect(response.body).to include('data-column-toggle-group-value="ce"')
+ end
+
+ it "filters to all CE requests" do
+ get registrants_event_path(event, ce_status: "requested")
+ expect(response.body).to include("Complete Person")
+ expect(response.body).to include("Missing Person")
+ expect(response.body).not_to include("Noce Person")
+ end
+
+ it "filters to CE requests missing a license number" do
+ get registrants_event_path(event, ce_status: "license_not_provided")
+ expect(response.body).to include("Missing Person")
+ expect(response.body).not_to include("Complete Person")
+ end
+
+ it "filters to CE requests missing hours" do
+ get registrants_event_path(event, ce_status: "hours_not_provided")
+ expect(response.body).to include("Missing Person")
+ expect(response.body).not_to include("Complete Person")
+ end
+
+ it "filters to paid CE requests" do
+ get registrants_event_path(event, ce_status: "paid")
+ expect(response.body).to include("Complete Person")
+ expect(response.body).not_to include("Missing Person")
+ end
+
+ it "does not crash on an invalid ce_status" do
+ get registrants_event_path(event, ce_status: "bogus")
+ expect(response).to have_http_status(:ok)
+ end
+
+ it "hides CE entirely when the event's registration form doesn't offer CE" do
+ plain_event = create(:event)
+ create(:event_registration, event: plain_event, ce_credit_requested: true)
+ get registrants_event_path(plain_event)
+ expect(response.body).not_to include("CE status")
+ end
+
+ it "includes a CE status column in the CSV export" do
+ get registrants_event_path(event, format: :csv)
+ expect(response.body).to include("CE status")
+ expect(response.body).to include("Incomplete")
+ end
+ end
+
+ describe "GET /events/:id/registrants CE status column states" do
+ let(:event) { offer_ce!(create(:event, cost_cents: 1_000)) }
+ let(:person) { create(:person, first_name: "Cee", last_name: "Ee") }
+
+ before { sign_in admin }
+
+ # The CE chip is the only content of the CE column cell, so its squished text
+ # is the chip label (the trailing link arrow icon contributes no text).
+ def ce_chip_text
+ Nokogiri::HTML(response.body).at_css('td[data-column-toggle-col="ce"]')&.text&.squish
+ end
+
+ it "shows Create when CE was not requested" do
+ create(:event_registration, event: event, registrant: person, ce_credit_requested: false)
+ get registrants_event_path(event)
+ expect(ce_chip_text).to eq("Create")
+ end
+
+ it "shows Requested when requested but no CE registration record exists yet" do
+ create(:event_registration, event: event, registrant: person, ce_credit_requested: true)
+ get registrants_event_path(event)
+ expect(ce_chip_text).to eq("Requested")
+ end
+
+ it "shows No license # once a CE record exists without a license number" do
+ reg = create(:event_registration, event: event, registrant: person, ce_credit_requested: true)
+ create(:continuing_education_registration, event_registration: reg,
+ professional_license: create(:professional_license, :placeholder, person: person))
+ get registrants_event_path(event)
+ expect(ce_chip_text).to eq("No license #")
+ end
+
+ it "shows Filed once a license is on file but the CE balance is unpaid" do
+ reg = create(:event_registration, event: event, registrant: person, ce_credit_requested: true)
+ create(:continuing_education_registration, event_registration: reg, cost_cents: 15_000,
+ professional_license: create(:professional_license, person: person))
+ get registrants_event_path(event)
+ expect(ce_chip_text).to eq("Filed")
+ end
+
+ it "shows Recipient when the CE balance is paid" do
+ reg = create(:event_registration, event: event, registrant: person, ce_credit_requested: true)
+ cer = create(:continuing_education_registration, event_registration: reg, cost_cents: 15_000,
+ professional_license: create(:professional_license, person: person))
+ create(:allocation, source: create(:payment, amount_cents: 15_000, amount_cents_remaining: 15_000),
+ allocatable: cer, amount: 15_000)
+ get registrants_event_path(event)
+ expect(ce_chip_text).to eq("Recipient")
+ end
+ end
+
describe "GET /events/:id/registrants with state and county filters" do
let(:ca_person) { create(:person, first_name: "Cali", last_name: "Person") }
let(:ny_person) { create(:person, first_name: "York", last_name: "Person") }
@@ -888,7 +1031,10 @@ def submit_agency_name(name)
let(:person) { create(:person, first_name: "Onboard", last_name: "Ready") }
let!(:registration) { create(:event_registration, event: event, registrant: person) }
- before { sign_in admin }
+ before do
+ offer_ce!(event)
+ sign_in admin
+ end
it "renders the onboarding matrix with the checklist columns" do
get onboarding_event_path(event)
@@ -936,7 +1082,7 @@ def submit_agency_name(name)
get onboarding_event_path(event, highlight: registration.id)
expect(response.body).to include("id=\"onboarding-row-#{registration.id}\"")
- expect(response.body).to include("ring-amber-300")
+ expect(response.body).to include("ring-yellow-500")
end
it "shows an Onboarding back-link to the row on registration edit" do
diff --git a/spec/requests/scholarships_spec.rb b/spec/requests/scholarships_spec.rb
index 3746223ad6..73384e966d 100644
--- a/spec/requests/scholarships_spec.rb
+++ b/spec/requests/scholarships_spec.rb
@@ -171,10 +171,10 @@
end
describe "back link follows the page the user came from" do
- it "links the new page back to the registrants roster when return_to=registrants" do
+ it "links the new page back to the registrants roster (anchored to the row) when return_to=registrants" do
get new_scholarship_path(allocatable_sgid: registration.to_sgid.to_s, return_to: "registrants")
- expect(response.body).to include("href=\"#{registrants_event_path(event)}\"")
+ expect(response.body).to include("href=\"#{registrants_event_path(event, highlight: registration.id, anchor: "registrant-row-#{registration.id}")}\"")
expect(response.body).not_to include("href=\"#{edit_event_registration_path(registration)}\"")
end
@@ -184,10 +184,10 @@
expect(response.body).to include("href=\"#{edit_event_registration_path(registration)}\"")
end
- it "links the edit page back to the registrants roster when return_to=registrants" do
+ it "links the edit page back to the registrants roster (anchored to the row) when return_to=registrants" do
get edit_scholarship_path(scholarship, return_to: "registrants")
- expect(response.body).to include("href=\"#{registrants_event_path(event)}\"")
+ expect(response.body).to include("href=\"#{registrants_event_path(event, highlight: registration.id, anchor: "registrant-row-#{registration.id}")}\"")
end
it "links the edit page back to the registration when return_to=registration" do
diff --git a/spec/services/reminder_recipient_filter_spec.rb b/spec/services/reminder_recipient_filter_spec.rb
index f4e6c11a39..140d5cdf31 100644
--- a/spec/services/reminder_recipient_filter_spec.rb
+++ b/spec/services/reminder_recipient_filter_spec.rb
@@ -110,31 +110,28 @@ def matched(params, registrations)
it "filters intends-to-pay registrants" do
expect(matched({ payment_status: "intends_to_pay" }, [ paid, due, intends ])).to eq([ intends.id ].to_set)
end
-
- it "filters paid + intends registrants" do
- expect(matched({ payment_status: "paid_or_intends" }, [ paid, due, intends ])).to eq([ paid.id, intends.id ].to_set)
- end
end
- context "scholarship status" do
- let!(:requested) { registration.tap { |r| r.update!(scholarship_requested: true) } }
+ # Shares the registrants-roster `scholarship` filter (yes/complete/incomplete).
+ context "scholarship" do
+ let!(:none) { registration.tap { |r| r.update!(scholarship_requested: true) } }
let!(:allocated) { registration(first_name: "Alloc").tap { |r| award_scholarship(r) } }
let!(:completed) { registration(first_name: "Done").tap { |r| award_scholarship(r, tasks_completed: true) } }
- it "filters requested" do
- expect(matched({ scholarship_status: "requested" }, [ requested, allocated, completed ]))
- .to eq([ requested.id ].to_set)
- end
-
- it "filters allocated" do
- expect(matched({ scholarship_status: "allocated" }, [ requested, allocated, completed ]))
+ it "filters all recipients" do
+ expect(matched({ scholarship: "yes" }, [ none, allocated, completed ]))
.to eq([ allocated.id, completed.id ].to_set)
end
- it "filters tasks completed" do
- expect(matched({ scholarship_status: "tasks_completed" }, [ requested, allocated, completed ]))
+ it "filters tasks complete" do
+ expect(matched({ scholarship: "complete" }, [ none, allocated, completed ]))
.to eq([ completed.id ].to_set)
end
+
+ it "filters tasks not complete" do
+ expect(matched({ scholarship: "incomplete" }, [ none, allocated, completed ]))
+ .to eq([ allocated.id ].to_set)
+ end
end
context "account status" do