From 00f43141510150951225bcbb28926feb383931f4 Mon Sep 17 00:00:00 2001 From: dp-daly Date: Tue, 21 Jan 2025 16:23:10 +0000 Subject: [PATCH] Update status labels in line with latest designs --- config/locales/en/activerecord.yml | 18 +++++------ .../claim/status_tag_component_spec.rb | 18 +++++------ ..._filters_clawback_claims_by_status_spec.rb | 32 +++++++++---------- .../support_user_requests_a_clawback_spec.rb | 2 +- ...support_user_views_clawbacks_index_spec.rb | 2 +- .../payments/reject_claim_payment_spec.rb | 2 +- .../claims/payments/view_a_claim_spec.rb | 2 +- ..._is_being_rejected_by_the_provider_spec.rb | 4 +-- ...n_the_provider_rejected_the_mentor_spec.rb | 4 +-- ...y_the_provider_rejected_the_mentor_spec.rb | 2 +- ...y_mentors_rejected_by_the_provider_spec.rb | 2 +- ...the_claim_as_provider_not_approved_spec.rb | 4 +-- ...son_the_school_rejected_the_mentor_spec.rb | 4 +-- ...why_the_school_rejected_the_mentor_spec.rb | 2 +- ...t_user_marks_the_claim_as_rejected_spec.rb | 4 +-- ...a_provider_rejected_sampling_claim_spec.rb | 2 +- .../support_user_approves_a_claim_spec.rb | 2 +- ...r_filters_sampled_claims_by_status_spec.rb | 24 +++++++------- 18 files changed, 65 insertions(+), 65 deletions(-) diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 58267be92..0048536a0 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -14,16 +14,16 @@ en: internal_draft: Internal draft draft: Draft submitted: Submitted - payment_in_progress: Payment in progress - payment_information_requested: Information requested - payment_information_sent: Information sent + payment_in_progress: Payer payment review + payment_information_requested: Payer needs information + payment_information_sent: Information sent to payer paid: Paid - payment_not_approved: Payment not approved - sampling_in_progress: Sampling in progress - sampling_provider_not_approved: Provider not approved - sampling_not_approved: Claim not approved - clawback_requested: Clawback requested - clawback_in_progress: Clawback in progress + payment_not_approved: Rejected by payer + sampling_in_progress: Audit requested + sampling_provider_not_approved: Rejected by provider + sampling_not_approved: Rejected by school + clawback_requested: Ready for clawback + clawback_in_progress: Sent to payer for clawback clawback_complete: Clawback complete claims/claim_activity/action: payment_request_delivered: Claims sent to ESFA for payment diff --git a/spec/components/claim/status_tag_component_spec.rb b/spec/components/claim/status_tag_component_spec.rb index c6a27c197..2ab1317bf 100644 --- a/spec/components/claim/status_tag_component_spec.rb +++ b/spec/components/claim/status_tag_component_spec.rb @@ -35,7 +35,7 @@ let(:claim) { build(:claim, status: :payment_in_progress) } it "renders a yellow tag" do - expect(page).to have_css(".govuk-tag--yellow", text: "Payment in progress") + expect(page).to have_css(".govuk-tag--yellow", text: "Payer payment review") end end @@ -43,7 +43,7 @@ let(:claim) { build(:claim, status: :payment_information_requested) } it "renders a turquoise tag" do - expect(page).to have_css(".govuk-tag--turquoise", text: "Information requested") + expect(page).to have_css(".govuk-tag--turquoise", text: "Payer needs information") end end @@ -51,7 +51,7 @@ let(:claim) { build(:claim, status: :payment_information_sent) } it "renders a yellow tag" do - expect(page).to have_css(".govuk-tag--yellow", text: "Information sent") + expect(page).to have_css(".govuk-tag--yellow", text: "Information sent to payer") end end @@ -67,7 +67,7 @@ let(:claim) { build(:claim, status: :payment_not_approved) } it "renders a orange tag" do - expect(page).to have_css(".govuk-tag--orange", text: "Payment not approved") + expect(page).to have_css(".govuk-tag--orange", text: "Rejected by payer") end end @@ -75,7 +75,7 @@ let(:claim) { build(:claim, status: :sampling_in_progress) } it "renders a yellow tag" do - expect(page).to have_css(".govuk-tag--yellow", text: "Sampling in progress") + expect(page).to have_css(".govuk-tag--yellow", text: "Audit requested") end end @@ -83,7 +83,7 @@ let(:claim) { build(:claim, status: :sampling_provider_not_approved) } it "renders a turquoise tag" do - expect(page).to have_css(".govuk-tag--turquoise", text: "Provider not approved") + expect(page).to have_css(".govuk-tag--turquoise", text: "Rejected by provider") end end @@ -91,7 +91,7 @@ let(:claim) { build(:claim, status: :sampling_not_approved) } it "renders a turquoise tag" do - expect(page).to have_css(".govuk-tag--turquoise", text: "Claim not approved") + expect(page).to have_css(".govuk-tag--turquoise", text: "Rejected by school") end end @@ -99,7 +99,7 @@ let(:claim) { build(:claim, status: :clawback_requested) } it "renders a turquoise tag" do - expect(page).to have_css(".govuk-tag--turquoise", text: "Clawback requested") + expect(page).to have_css(".govuk-tag--turquoise", text: "Ready for clawback") end end @@ -107,7 +107,7 @@ let(:claim) { build(:claim, status: :clawback_in_progress) } it "renders a yellow tag" do - expect(page).to have_css(".govuk-tag--yellow", text: "Clawback in progress") + expect(page).to have_css(".govuk-tag--yellow", text: "Sent to payer for clawback") end end diff --git a/spec/system/claims/support/claims/clawbacks/support_user_filters_clawback_claims_by_status_spec.rb b/spec/system/claims/support/claims/clawbacks/support_user_filters_clawback_claims_by_status_spec.rb index ceb2dc0f7..054b9c5ae 100644 --- a/spec/system/claims/support/claims/clawbacks/support_user_filters_clawback_claims_by_status_spec.rb +++ b/spec/system/claims/support/claims/clawbacks/support_user_filters_clawback_claims_by_status_spec.rb @@ -143,7 +143,7 @@ def and_i_see_claims_with_a_sampling_not_approved_status expect(page).to have_claim_card({ "title" => "#{@sampling_not_approved_claim.reference} - #{@sampling_not_approved_claim.school.name}", "url" => "/support/claims/clawbacks/claims/#{@sampling_not_approved_claim.id}", - "status" => "Clawback in progress", + "status" => "Sent to payer for clawback", "academic_year" => @sampling_not_approved_claim.academic_year.name, "provider_name" => @sampling_not_approved_claim.provider.name, "submitted_at" => I18n.l(@sampling_not_approved_claim.submitted_at.to_date, format: :long), @@ -156,23 +156,23 @@ def and_i_click_on_apply_filters end def when_i_select_the_clawback_in_progress_filter - check "Clawback in progress" + check "Sent to payer for clawback" end alias_method :and_i_select_the_clawback_in_progress_filter, :when_i_select_the_clawback_in_progress_filter def when_i_select_the_clawback_requested_filter - check "Clawback requested" + check "Ready for clawback" end alias_method :and_i_select_the_clawback_requested_filter, :when_i_select_the_clawback_requested_filter def when_i_unselect_the_clawback_in_progress_filter - uncheck "Clawback in progress" + uncheck "Sent to payer for clawback" end def and_i_select_the_sampling_not_approved_filter - check "Claim not approved" + check "Rejected by school" end def and_i_do_not_see_claims_with_a_clawback_requested_status @@ -195,25 +195,25 @@ def and_i_do_not_see_claims_with_a_clawback_in_progress_status def and_i_see_clawback_in_progress_selected_from_the_status_filter expect(page).to have_element(:legend, text: "Status", class: "govuk-fieldset__legend") - expect(page).to have_checked_field("Clawback in progress") - expect(page).to have_filter_tag("Clawback in progress") + expect(page).to have_checked_field("Sent to payer for clawback") + expect(page).to have_filter_tag("Sent to payer for clawback") end def and_i_see_clawback_requested_selected_from_the_status_filter expect(page).to have_element(:legend, text: "Status", class: "govuk-fieldset__legend") - expect(page).to have_checked_field("Clawback requested") - expect(page).to have_filter_tag("Clawback requested") + expect(page).to have_checked_field("Ready for clawback") + expect(page).to have_filter_tag("Ready for clawback") end def and_i_see_sampling_not_approved_selected_from_the_status_filter expect(page).to have_element(:legend, text: "Status", class: "govuk-fieldset__legend") - expect(page).to have_checked_field("Claim not approved") - expect(page).to have_filter_tag("Claim not approved") + expect(page).to have_checked_field("Rejected by school") + expect(page).to have_filter_tag("Rejected by school") end def and_i_do_not_see_clawback_requested_selected_from_the_status_filter - expect(page).not_to have_checked_field("Clawback requested") - expect(page).not_to have_filter_tag("Clawback requested") + expect(page).not_to have_checked_field("Ready for clawback") + expect(page).not_to have_filter_tag("Ready for clawback") end def and_i_do_not_see_sampling_not_approved_selected_from_the_status_filter @@ -222,13 +222,13 @@ def and_i_do_not_see_sampling_not_approved_selected_from_the_status_filter end def and_i_do_not_see_clawback_in_progress_selected_from_the_status_filter - expect(page).not_to have_checked_field("Clawback in progress") - expect(page).not_to have_filter_tag("Clawback in progress") + expect(page).not_to have_checked_field("Sent to payer for clawback") + expect(page).not_to have_filter_tag("Sent to payer for clawback") end def when_i_click_on_the_clawback_requested_filter_tag within ".app-filter-tags" do - click_on "Clawback requested" + click_on "Ready for clawback" end end diff --git a/spec/system/claims/support/claims/clawbacks/support_user_requests_a_clawback_spec.rb b/spec/system/claims/support/claims/clawbacks/support_user_requests_a_clawback_spec.rb index 9aea09383..6b66666d1 100644 --- a/spec/system/claims/support/claims/clawbacks/support_user_requests_a_clawback_spec.rb +++ b/spec/system/claims/support/claims/clawbacks/support_user_requests_a_clawback_spec.rb @@ -88,7 +88,7 @@ def then_i_see_the_show_page_for_claim_one expect(primary_navigation).to have_current_item("Claims") expect(page).to have_element(:span, text: "Clawbacks - Claim 11111111", class: "govuk-caption-l") expect(page).to have_h1(@claim_one.school_name) - expect(page).to have_element(:strong, text: "Claim not approved", class: "govuk-tag govuk-tag--turquoise") + expect(page).to have_element(:strong, text: "Rejected by school", class: "govuk-tag govuk-tag--turquoise") expect(page).to have_link("Request clawback", href: "/support/claims/clawbacks/claims/new/#{@claim_one.id}") expect(page).to have_summary_list_row("School", @claim_one.school_name) expect(page).to have_summary_list_row("Academic year", @claim_one.academic_year_name) diff --git a/spec/system/claims/support/claims/clawbacks/support_user_views_clawbacks_index_spec.rb b/spec/system/claims/support/claims/clawbacks/support_user_views_clawbacks_index_spec.rb index f267dad95..eb74827b2 100644 --- a/spec/system/claims/support/claims/clawbacks/support_user_views_clawbacks_index_spec.rb +++ b/spec/system/claims/support/claims/clawbacks/support_user_views_clawbacks_index_spec.rb @@ -180,6 +180,6 @@ def then_i_see_the_details_of_the_clawback_requested_claim ) expect(page).to have_element(:span, text: "Clawbacks - Claim #{@clawback_requested_claim.reference}", class: "govuk-caption-l") expect(page).to have_h1(@clawback_requested_claim.school.name) - expect(page).to have_element(:strong, text: "Clawback requested", class: "govuk-tag govuk-tag--turquoise") + expect(page).to have_element(:strong, text: "Ready for clawback", class: "govuk-tag govuk-tag--turquoise") end end diff --git a/spec/system/claims/support/claims/payments/reject_claim_payment_spec.rb b/spec/system/claims/support/claims/payments/reject_claim_payment_spec.rb index bdbbab190..ddef3db3d 100644 --- a/spec/system/claims/support/claims/payments/reject_claim_payment_spec.rb +++ b/spec/system/claims/support/claims/payments/reject_claim_payment_spec.rb @@ -41,7 +41,7 @@ def then_i_see_the_claim_rejected expect(page).to have_content("Claim rejected") within("h1.govuk-heading-l .govuk-tag") do - expect(page).to have_content("Payment not approved") + expect(page).to have_content("Rejected by payer") end end end diff --git a/spec/system/claims/support/claims/payments/view_a_claim_spec.rb b/spec/system/claims/support/claims/payments/view_a_claim_spec.rb index 6b3af62d9..4983beb25 100644 --- a/spec/system/claims/support/claims/payments/view_a_claim_spec.rb +++ b/spec/system/claims/support/claims/payments/view_a_claim_spec.rb @@ -34,7 +34,7 @@ def when_i_click_on_claim(claim) def then_i_can_see_the_details_of_claim(claim) expect(page).to have_content("Claim #{claim.reference}") - expect(page).to have_content("Information requested") + expect(page).to have_content("Payer needs information") expect(page).to have_content("School#{claim.school_name}") expect(page).to have_content("Academic year#{claim.academic_year_name}") expect(page).to have_content("Accredited provider#{claim.provider.name}") diff --git a/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_changes_the_mentor_who_is_being_rejected_by_the_provider_spec.rb b/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_changes_the_mentor_who_is_being_rejected_by_the_provider_spec.rb index a5055d24c..7b9a80dda 100644 --- a/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_changes_the_mentor_who_is_being_rejected_by_the_provider_spec.rb +++ b/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_changes_the_mentor_who_is_being_rejected_by_the_provider_spec.rb @@ -89,7 +89,7 @@ def then_i_see_the_details_of_the_claim ) expect(page).to have_element(:p, text: "Sampling - Claim #{@claim.reference}", class: "govuk-caption-l") expect(page).to have_h1(@claim.school.name) - expect(page).to have_element(:strong, text: "Sampling in progress", class: "govuk-tag govuk-tag--yellow") + expect(page).to have_element(:strong, text: "Audit requested", class: "govuk-tag govuk-tag--yellow") end def when_i_click_on_confirm_provider_rejected_claim @@ -108,7 +108,7 @@ def then_i_see_that_the_claim_has_been_updated_to_provider_not_approved ) expect(page).to have_h1(@claim.school.name) - expect(page).to have_element(:strong, text: "Provider not approved", class: "govuk-tag govuk-tag--turquoise") + expect(page).to have_element(:strong, text: "Rejected by provider", class: "govuk-tag govuk-tag--turquoise") expect(page).to have_success_banner("Claim updated") end diff --git a/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_changes_the_reason_the_provider_rejected_the_mentor_spec.rb b/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_changes_the_reason_the_provider_rejected_the_mentor_spec.rb index 1fd855731..ca2cb81b2 100644 --- a/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_changes_the_reason_the_provider_rejected_the_mentor_spec.rb +++ b/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_changes_the_reason_the_provider_rejected_the_mentor_spec.rb @@ -84,7 +84,7 @@ def then_i_see_the_details_of_the_claim ) expect(page).to have_element(:p, text: "Sampling - Claim #{@claim.reference}", class: "govuk-caption-l") expect(page).to have_h1(@claim.school.name) - expect(page).to have_element(:strong, text: "Sampling in progress", class: "govuk-tag govuk-tag--yellow") + expect(page).to have_element(:strong, text: "Audit requested", class: "govuk-tag govuk-tag--yellow") end def when_i_click_on_confirm_provider_rejected_claim @@ -103,7 +103,7 @@ def then_i_see_that_the_claim_has_been_updated_to_provider_not_approved ) expect(page).to have_h1(@claim.school.name) - expect(page).to have_element(:strong, text: "Provider not approved", class: "govuk-tag govuk-tag--turquoise") + expect(page).to have_element(:strong, text: "Rejected by provider", class: "govuk-tag govuk-tag--turquoise") expect(page).to have_success_banner("Claim updated") end diff --git a/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_does_not_enter_a_reason_why_the_provider_rejected_the_mentor_spec.rb b/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_does_not_enter_a_reason_why_the_provider_rejected_the_mentor_spec.rb index 2021e29d1..49351bec2 100644 --- a/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_does_not_enter_a_reason_why_the_provider_rejected_the_mentor_spec.rb +++ b/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_does_not_enter_a_reason_why_the_provider_rejected_the_mentor_spec.rb @@ -69,7 +69,7 @@ def then_i_see_the_details_of_the_claim ) expect(page).to have_element(:p, text: "Sampling - Claim #{@claim.reference}", class: "govuk-caption-l") expect(page).to have_h1(@claim.school.name) - expect(page).to have_element(:strong, text: "Sampling in progress", class: "govuk-tag govuk-tag--yellow") + expect(page).to have_element(:strong, text: "Audit requested", class: "govuk-tag govuk-tag--yellow") end def when_i_click_on_confirm_provider_rejected_claim diff --git a/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_does_not_select_any_mentors_rejected_by_the_provider_spec.rb b/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_does_not_select_any_mentors_rejected_by_the_provider_spec.rb index 521c85f77..f909ed275 100644 --- a/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_does_not_select_any_mentors_rejected_by_the_provider_spec.rb +++ b/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_does_not_select_any_mentors_rejected_by_the_provider_spec.rb @@ -63,7 +63,7 @@ def then_i_see_the_details_of_the_claim ) expect(page).to have_element(:p, text: "Sampling - Claim #{@claim.reference}", class: "govuk-caption-l") expect(page).to have_h1(@claim.school.name) - expect(page).to have_element(:strong, text: "Sampling in progress", class: "govuk-tag govuk-tag--yellow") + expect(page).to have_element(:strong, text: "Audit requested", class: "govuk-tag govuk-tag--yellow") end def when_i_click_on_confirm_provider_rejected_claim diff --git a/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_marks_the_claim_as_provider_not_approved_spec.rb b/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_marks_the_claim_as_provider_not_approved_spec.rb index c9f33eff6..21408546f 100644 --- a/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_marks_the_claim_as_provider_not_approved_spec.rb +++ b/spec/system/claims/support/claims/sampling/mark_claim_as_provider_not_approved/support_user_marks_the_claim_as_provider_not_approved_spec.rb @@ -126,7 +126,7 @@ def then_i_see_the_details_of_the_claim ) expect(page).to have_element(:p, text: "Sampling - Claim #{@claim.reference}", class: "govuk-caption-l") expect(page).to have_h1(@claim.school.name) - expect(page).to have_element(:strong, text: "Sampling in progress", class: "govuk-tag govuk-tag--yellow") + expect(page).to have_element(:strong, text: "Audit requested", class: "govuk-tag govuk-tag--yellow") end def when_i_click_on_confirm_provider_rejected_claim @@ -152,7 +152,7 @@ def then_i_see_that_the_claim_has_been_updated_to_provider_not_approved ) expect(page).to have_h1(@claim.school.name) - expect(page).to have_element(:strong, text: "Provider not approved", class: "govuk-tag govuk-tag--turquoise") + expect(page).to have_element(:strong, text: "Rejected by provider", class: "govuk-tag govuk-tag--turquoise") expect(page).to have_success_banner("Claim updated") end diff --git a/spec/system/claims/support/claims/sampling/mark_claim_as_rejected/support_user_changes_the_reason_the_school_rejected_the_mentor_spec.rb b/spec/system/claims/support/claims/sampling/mark_claim_as_rejected/support_user_changes_the_reason_the_school_rejected_the_mentor_spec.rb index 88f85ffaf..78f64ce8d 100644 --- a/spec/system/claims/support/claims/sampling/mark_claim_as_rejected/support_user_changes_the_reason_the_school_rejected_the_mentor_spec.rb +++ b/spec/system/claims/support/claims/sampling/mark_claim_as_rejected/support_user_changes_the_reason_the_school_rejected_the_mentor_spec.rb @@ -83,7 +83,7 @@ def then_i_see_the_details_of_the_claim ) expect(page).to have_element(:p, text: "Sampling - Claim #{@claim.reference}", class: "govuk-caption-l") expect(page).to have_h1(@claim.school.name) - expect(page).to have_element(:strong, text: "Provider not approved", class: "govuk-tag govuk-tag--turquoise") + expect(page).to have_element(:strong, text: "Rejected by provider", class: "govuk-tag govuk-tag--turquoise") end def when_i_click_on_reject_claim @@ -102,7 +102,7 @@ def then_i_see_that_the_claim_has_been_updated_to_not_approved ) expect(page).to have_h1(@claim.school.name) - expect(page).to have_element(:strong, text: "Claim not approved", class: "govuk-tag govuk-tag--turquoise") + expect(page).to have_element(:strong, text: "Rejected by school", class: "govuk-tag govuk-tag--turquoise") expect(page).to have_success_banner("Claim updated") end diff --git a/spec/system/claims/support/claims/sampling/mark_claim_as_rejected/support_user_does_not_enter_a_reason_why_the_school_rejected_the_mentor_spec.rb b/spec/system/claims/support/claims/sampling/mark_claim_as_rejected/support_user_does_not_enter_a_reason_why_the_school_rejected_the_mentor_spec.rb index fe9a11b58..1662abad5 100644 --- a/spec/system/claims/support/claims/sampling/mark_claim_as_rejected/support_user_does_not_enter_a_reason_why_the_school_rejected_the_mentor_spec.rb +++ b/spec/system/claims/support/claims/sampling/mark_claim_as_rejected/support_user_does_not_enter_a_reason_why_the_school_rejected_the_mentor_spec.rb @@ -71,7 +71,7 @@ def then_i_see_the_details_of_the_claim ) expect(page).to have_element(:p, text: "Sampling - Claim #{@claim.reference}", class: "govuk-caption-l") expect(page).to have_h1(@claim.school.name) - expect(page).to have_element(:strong, text: "Provider not approved", class: "govuk-tag govuk-tag--turquoise") + expect(page).to have_element(:strong, text: "Rejected by provider", class: "govuk-tag govuk-tag--turquoise") end def when_i_click_on_reject_claim diff --git a/spec/system/claims/support/claims/sampling/mark_claim_as_rejected/support_user_marks_the_claim_as_rejected_spec.rb b/spec/system/claims/support/claims/sampling/mark_claim_as_rejected/support_user_marks_the_claim_as_rejected_spec.rb index 1a361fd74..8677e0655 100644 --- a/spec/system/claims/support/claims/sampling/mark_claim_as_rejected/support_user_marks_the_claim_as_rejected_spec.rb +++ b/spec/system/claims/support/claims/sampling/mark_claim_as_rejected/support_user_marks_the_claim_as_rejected_spec.rb @@ -134,7 +134,7 @@ def then_i_see_the_details_of_the_claim ) expect(page).to have_element(:p, text: "Sampling - Claim #{@claim.reference}", class: "govuk-caption-l") expect(page).to have_h1(@claim.school.name) - expect(page).to have_element(:strong, text: "Provider not approved", class: "govuk-tag govuk-tag--turquoise") + expect(page).to have_element(:strong, text: "Rejected by provider", class: "govuk-tag govuk-tag--turquoise") end def when_i_click_on_reject_claim @@ -160,7 +160,7 @@ def then_i_see_that_the_claim_has_been_updated_to_not_approved ) expect(page).to have_h1(@claim.school.name) - expect(page).to have_element(:strong, text: "Claim not approved", class: "govuk-tag govuk-tag--turquoise") + expect(page).to have_element(:strong, text: "Rejected by school", class: "govuk-tag govuk-tag--turquoise") expect(page).to have_success_banner("Claim updated") end diff --git a/spec/system/claims/support/claims/sampling/mark_provider_rejected_claim_as_approved/support_user_approves_a_provider_rejected_sampling_claim_spec.rb b/spec/system/claims/support/claims/sampling/mark_provider_rejected_claim_as_approved/support_user_approves_a_provider_rejected_sampling_claim_spec.rb index 277a28290..d38d03906 100644 --- a/spec/system/claims/support/claims/sampling/mark_provider_rejected_claim_as_approved/support_user_approves_a_provider_rejected_sampling_claim_spec.rb +++ b/spec/system/claims/support/claims/sampling/mark_provider_rejected_claim_as_approved/support_user_approves_a_provider_rejected_sampling_claim_spec.rb @@ -99,7 +99,7 @@ def then_i_see_the_details_of_the_provider_rejected_sampling_claim ) expect(page).to have_element(:p, text: "Sampling - Claim #{@provider_rejected_sampling_claim.reference}", class: "govuk-caption-l") expect(page).to have_h1(@provider_rejected_sampling_claim.school.name) - expect(page).to have_element(:strong, text: "Provider not approved", class: "govuk-tag govuk-tag--turquoise") + expect(page).to have_element(:strong, text: "Rejected by provider", class: "govuk-tag govuk-tag--turquoise") end def when_i_click_on_back diff --git a/spec/system/claims/support/claims/sampling/support_user_approves_a_claim_spec.rb b/spec/system/claims/support/claims/sampling/support_user_approves_a_claim_spec.rb index 2a1a73e7b..a34956b23 100644 --- a/spec/system/claims/support/claims/sampling/support_user_approves_a_claim_spec.rb +++ b/spec/system/claims/support/claims/sampling/support_user_approves_a_claim_spec.rb @@ -100,7 +100,7 @@ def then_i_see_the_details_of_the_sampling_claim ) expect(page).to have_element(:p, text: "Sampling - Claim #{@sampling_claim.reference}", class: "govuk-caption-l") expect(page).to have_h1(@sampling_claim.school.name) - expect(page).to have_element(:strong, text: "Sampling in progress", class: "govuk-tag govuk-tag--yellow") + expect(page).to have_element(:strong, text: "Audit requested", class: "govuk-tag govuk-tag--yellow") end def when_i_click_on_back diff --git a/spec/system/claims/support/claims/sampling/support_user_filters_sampled_claims_by_status_spec.rb b/spec/system/claims/support/claims/sampling/support_user_filters_sampled_claims_by_status_spec.rb index 6d97722cd..67e66d97c 100644 --- a/spec/system/claims/support/claims/sampling/support_user_filters_sampled_claims_by_status_spec.rb +++ b/spec/system/claims/support/claims/sampling/support_user_filters_sampled_claims_by_status_spec.rb @@ -128,19 +128,19 @@ def and_i_click_on_apply_filters end def when_i_select_the_sampling_in_progress_filter - check "Sampling in progress" + check "Audit requested" end alias_method :and_i_select_the_sampling_in_progress_filter, :when_i_select_the_sampling_in_progress_filter def when_i_select_the_sampling_provider_not_approved_filter - check "Provider not approved" + check "Rejected by provider" end alias_method :and_i_select_the_sampling_provider_not_approved_filter, :when_i_select_the_sampling_provider_not_approved_filter def when_i_unselect_the_sampling_in_progress_filter - uncheck "Sampling in progress" + uncheck "Audit requested" end def and_i_do_not_see_claims_with_a_sampling_provider_not_approved_status @@ -157,29 +157,29 @@ def and_i_do_not_see_claims_with_a_sampling_in_progress_status def and_i_see_sampling_in_progress_selected_from_the_status_filter expect(page).to have_element(:legend, text: "Status", class: "govuk-fieldset__legend") - expect(page).to have_checked_field("Sampling in progress") - expect(page).to have_filter_tag("Sampling in progress") + expect(page).to have_checked_field("Audit requested") + expect(page).to have_filter_tag("Audit requested") end def and_i_see_sampling_provider_not_approved_selected_from_the_status_filter expect(page).to have_element(:legend, text: "Status", class: "govuk-fieldset__legend") - expect(page).to have_checked_field("Provider not approved") - expect(page).to have_filter_tag("Provider not approved") + expect(page).to have_checked_field("Rejected by provider") + expect(page).to have_filter_tag("Rejected by provider") end def and_i_do_not_see_sampling_provider_not_approved_selected_from_the_status_filter - expect(page).not_to have_checked_field("Provider not approved") - expect(page).not_to have_filter_tag("Provider not approved") + expect(page).not_to have_checked_field("Rejected by provider") + expect(page).not_to have_filter_tag("Rejected by provider") end def and_i_do_not_see_sampling_in_progress_selected_from_the_status_filter - expect(page).not_to have_checked_field("Sampling in progress") - expect(page).not_to have_filter_tag("Sampling in progress") + expect(page).not_to have_checked_field("Audit requested") + expect(page).not_to have_filter_tag("Audit requested") end def when_i_click_on_the_sampling_provider_not_approved_filter_tag within ".app-filter-tags" do - click_on "Provider not approved" + click_on "Rejected by provider" end end