diff --git a/app/forms/admin/claims_filter_form.rb b/app/forms/admin/claims_filter_form.rb index 9e37bb314e..01c7bf0220 100644 --- a/app/forms/admin/claims_filter_form.rb +++ b/app/forms/admin/claims_filter_form.rb @@ -57,7 +57,7 @@ def claims when "failed_bank_validation" Claim.includes(:decisions).failed_bank_validation.awaiting_decision when "awaiting_provider_verification" - Claim.by_policy(Policies::FurtherEducationPayments).awaiting_further_education_provider_verification + Claim.by_policy(Policies::FurtherEducationPayments).awaiting_further_education_provider_verification.awaiting_decision else Claim.includes(:decisions).not_held.awaiting_decision.not_awaiting_further_education_provider_verification end diff --git a/spec/forms/admin/claims_filter_form_spec.rb b/spec/forms/admin/claims_filter_form_spec.rb new file mode 100644 index 0000000000..a842414b2f --- /dev/null +++ b/spec/forms/admin/claims_filter_form_spec.rb @@ -0,0 +1,25 @@ +require "rails_helper" + +RSpec.describe Admin::ClaimsFilterForm, type: :model do + describe "#claims" do + context "when rejected whilst awaiting provider verification" do + let!(:claim) do + create( + :claim, + :rejected, + :awaiting_provider_verification, + policy: Policies::FurtherEducationPayments, + ) + end + + let(:session) { {} } + let(:filters) { { status: "awaiting_provider_verification" } } + + subject { described_class.new(filters:, session:) } + + it "filtering by status awaiting provider verification excludes them" do + expect(subject.claims).not_to include(claim) + end + end + end +end