diff --git a/spec/system/assessor_interface/checking_submitted_details_spec.rb b/spec/system/assessor_interface/checking_submitted_details_spec.rb index b51306957b..cfa7b8817c 100644 --- a/spec/system/assessor_interface/checking_submitted_details_spec.rb +++ b/spec/system/assessor_interface/checking_submitted_details_spec.rb @@ -266,7 +266,7 @@ def personal_information_task_item def and_i_see_check_personal_information_completed expect( assessor_application_page.personal_information_task.status_tag.text, - ).to eq("COMPLETED") + ).to eq("Completed") end def when_i_choose_check_personal_information_no @@ -314,7 +314,7 @@ def when_i_choose_check_qualifications_no def and_i_see_check_qualifications_completed expect(assessor_application_page.qualifications_task.status_tag.text).to eq( - "COMPLETED", + "Completed", ) end @@ -366,7 +366,7 @@ def and_i_choose_verify_age_range_subjects_no def and_i_see_verify_age_range_subjects_completed expect( assessor_application_page.age_range_subjects_task.status_tag.text, - ).to eq("COMPLETED") + ).to eq("Completed") end def then_i_see_the_work_history @@ -383,7 +383,7 @@ def when_i_choose_check_work_history_yes def and_i_see_check_work_history_completed expect(assessor_application_page.work_history_task.status_tag.text).to eq( - "COMPLETED", + "Completed", ) end @@ -437,7 +437,7 @@ def and_i_choose_induction_not_required def and_i_see_check_professional_standing_completed expect( assessor_application_page.professional_standing_task.status_tag.text, - ).to eq("COMPLETED") + ).to eq("Completed") end def when_i_choose_check_professional_standing_no diff --git a/spec/system/assessor_interface/completing_assessment_spec.rb b/spec/system/assessor_interface/completing_assessment_spec.rb index 3c672fe447..4b313114de 100644 --- a/spec/system/assessor_interface/completing_assessment_spec.rb +++ b/spec/system/assessor_interface/completing_assessment_spec.rb @@ -389,19 +389,19 @@ def when_i_click_on_overview_button def then_the_application_form_is_awarded expect(assessor_application_page.status_summary.value).to have_text( - "AWARDED", + "Awarded", ) end def then_the_application_form_is_waiting_on expect(assessor_application_page.status_summary.value.text).to include( - "WAITING ON", + "Waiting on", ) end def then_the_application_form_is_declined expect(assessor_application_page.status_summary.value).to have_text( - "DECLINED", + "Declined", ) end diff --git a/spec/system/assessor_interface/confirming_english_language_exemption_spec.rb b/spec/system/assessor_interface/confirming_english_language_exemption_spec.rb index 66ce5ff2e6..73a90701f9 100644 --- a/spec/system/assessor_interface/confirming_english_language_exemption_spec.rb +++ b/spec/system/assessor_interface/confirming_english_language_exemption_spec.rb @@ -285,7 +285,7 @@ def and_the_english_language_section_is_complete def assert_section_is_complete(section) expect( assessor_application_page.send("#{section}_task").status_tag.text, - ).to eq("COMPLETED") + ).to eq("Completed") end def application_form diff --git a/spec/system/assessor_interface/pre_assessment_tasks_spec.rb b/spec/system/assessor_interface/pre_assessment_tasks_spec.rb index b1ab12b122..4e03de2322 100644 --- a/spec/system/assessor_interface/pre_assessment_tasks_spec.rb +++ b/spec/system/assessor_interface/pre_assessment_tasks_spec.rb @@ -66,7 +66,7 @@ def given_there_is_an_application_form_with_professional_standing_request def and_i_see_a_waiting_on_status expect(assessor_application_page.status_summary.value).to have_text( - "PRELIMINARY CHECK", + "Preliminary check", ) end @@ -75,11 +75,11 @@ def and_i_see_an_unstarted_preliminary_check_task "Preliminary check (qualifications)", ) expect(assessor_application_page.preliminary_check_task).to have_content( - "NOT STARTED", + "Not started", ) expect( assessor_application_page.awaiting_professional_standing_task, - ).to have_content("WAITING ON") + ).to have_content("Waiting on") end def when_i_click_on_the_preliminary_check_task @@ -126,11 +126,11 @@ def and_i_see_the_failure_reasons def and_i_see_a_completed_preliminary_check_task expect(assessor_application_page.preliminary_check_task).to have_content( - "COMPLETED", + "Completed", ) expect( assessor_application_page.awaiting_professional_standing_task, - ).to have_content("WAITING ON") + ).to have_content("Waiting on") end def and_the_teacher_receives_a_checks_passed_email @@ -158,7 +158,7 @@ def when_i_fill_in_the_locate_form def and_i_see_a_preliminary_check_status expect(assessor_application_page.status_summary.value).to have_text( - "PRELIMINARY CHECK", + "Preliminary check", ) end diff --git a/spec/system/assessor_interface/reviewing_professional_standing_spec.rb b/spec/system/assessor_interface/reviewing_professional_standing_spec.rb index 88ef4f656b..2f15e9921b 100644 --- a/spec/system/assessor_interface/reviewing_professional_standing_spec.rb +++ b/spec/system/assessor_interface/reviewing_professional_standing_spec.rb @@ -130,7 +130,7 @@ def and_i_see_the_lops_not_started assessor_review_verifications_page.task_list.find_item( "Relevant competent authority", ) - expect(item.status_tag.text).to eq("NOT STARTED") + expect(item.status_tag.text).to eq("Not started") end def and_i_see_the_lops_accepted @@ -138,7 +138,7 @@ def and_i_see_the_lops_accepted assessor_review_verifications_page.task_list.find_item( "Relevant competent authority", ) - expect(item.status_tag.text).to eq("ACCEPTED") + expect(item.status_tag.text).to eq("Accepted") end def and_i_see_the_lops_rejected @@ -146,7 +146,7 @@ def and_i_see_the_lops_rejected assessor_review_verifications_page.task_list.find_item( "Relevant competent authority", ) - expect(item.status_tag.text).to eq("REJECTED") + expect(item.status_tag.text).to eq("Rejected") end def application_form diff --git a/spec/system/assessor_interface/reviewing_qualifications_spec.rb b/spec/system/assessor_interface/reviewing_qualifications_spec.rb index 32d04a167b..88cd6105aa 100644 --- a/spec/system/assessor_interface/reviewing_qualifications_spec.rb +++ b/spec/system/assessor_interface/reviewing_qualifications_spec.rb @@ -124,13 +124,13 @@ def when_i_click_on_back_to_overview def and_i_see_the_qualification_accepted item = assessor_review_verifications_page.task_list.find_item("BSc Teaching") - expect(item.status_tag.text).to eq("ACCEPTED") + expect(item.status_tag.text).to eq("Accepted") end def and_i_see_the_qualification_rejected item = assessor_review_verifications_page.task_list.find_item("BSc Teaching") - expect(item.status_tag.text).to eq("REJECTED") + expect(item.status_tag.text).to eq("Rejected") end def application_form diff --git a/spec/system/assessor_interface/reviewing_references_spec.rb b/spec/system/assessor_interface/reviewing_references_spec.rb index e99a92e270..b51f44f1b0 100644 --- a/spec/system/assessor_interface/reviewing_references_spec.rb +++ b/spec/system/assessor_interface/reviewing_references_spec.rb @@ -112,7 +112,7 @@ def when_i_click_on_the_reference def and_i_see_the_overdue_status expect(assessor_review_verifications_page).to have_content( - "This reference’s status has changed from OVERDUE to RECEIVED", + "This reference’s status has changed from Overdue to Received", ) end @@ -130,17 +130,17 @@ def when_i_click_on_back_to_overview def and_i_see_the_reference_not_started item = assessor_review_verifications_page.task_list.find_item("School") - expect(item.status_tag.text).to eq("NOT STARTED") + expect(item.status_tag.text).to eq("Not started") end def and_i_see_the_reference_accepted item = assessor_review_verifications_page.task_list.find_item("School") - expect(item.status_tag.text).to eq("ACCEPTED") + expect(item.status_tag.text).to eq("Accepted") end def and_i_see_the_reference_rejected item = assessor_review_verifications_page.task_list.find_item("School") - expect(item.status_tag.text).to eq("REJECTED") + expect(item.status_tag.text).to eq("Rejected") end def application_form diff --git a/spec/system/assessor_interface/verifying_professional_standing_spec.rb b/spec/system/assessor_interface/verifying_professional_standing_spec.rb index 26469acd64..a5a05b0665 100644 --- a/spec/system/assessor_interface/verifying_professional_standing_spec.rb +++ b/spec/system/assessor_interface/verifying_professional_standing_spec.rb @@ -17,8 +17,8 @@ reference:, assessment_id:, ) - and_the_request_lops_verification_status_is("NOT STARTED") - and_the_record_lops_response_status_is("CANNOT START") + and_the_request_lops_verification_status_is("Not started") + and_the_record_lops_response_status_is("Cannot start") when_i_click_request_lops_verification then_i_see_the( @@ -32,8 +32,8 @@ reference:, assessment_id:, ) - and_the_request_lops_verification_status_is("NOT STARTED") - and_the_record_lops_response_status_is("CANNOT START") + and_the_request_lops_verification_status_is("Not started") + and_the_record_lops_response_status_is("Cannot start") when_i_click_request_lops_verification and_i_submit_checked_on_the_request_form @@ -42,8 +42,8 @@ reference:, assessment_id:, ) - and_the_request_lops_verification_status_is("COMPLETED") - and_the_record_lops_response_status_is("WAITING ON") + and_the_request_lops_verification_status_is("Completed") + and_the_record_lops_response_status_is("Waiting on") end it "record" do @@ -56,8 +56,8 @@ reference:, assessment_id:, ) - and_the_request_lops_verification_status_is("COMPLETED") - and_the_record_lops_response_status_is("WAITING ON") + and_the_request_lops_verification_status_is("Completed") + and_the_record_lops_response_status_is("Waiting on") when_i_click_record_lops_response then_i_see_the( @@ -71,7 +71,7 @@ reference:, assessment_id:, ) - and_the_record_lops_response_status_is("COMPLETED") + and_the_record_lops_response_status_is("Completed") when_i_click_record_lops_response then_i_see_the( @@ -91,7 +91,7 @@ reference:, assessment_id:, ) - and_the_record_lops_response_status_is("REVIEW") + and_the_record_lops_response_status_is("Review") end it "record after overdue" do @@ -105,8 +105,8 @@ reference:, assessment_id:, ) - and_the_request_lops_verification_status_is("COMPLETED") - and_the_record_lops_response_status_is("OVERDUE") + and_the_request_lops_verification_status_is("Completed") + and_the_record_lops_response_status_is("Overdue") when_i_click_record_lops_response then_i_see_the( @@ -121,7 +121,7 @@ reference:, assessment_id:, ) - and_the_record_lops_response_status_is("COMPLETED") + and_the_record_lops_response_status_is("Completed") when_i_click_record_lops_response then_i_see_the( @@ -141,7 +141,7 @@ reference:, assessment_id:, ) - and_the_record_lops_response_status_is("REVIEW") + and_the_record_lops_response_status_is("Review") when_i_click_record_lops_response then_i_see_the( @@ -161,7 +161,7 @@ reference:, assessment_id:, ) - and_the_record_lops_response_status_is("REVIEW") + and_the_record_lops_response_status_is("Review") end private diff --git a/spec/system/assessor_interface/verifying_qualifications_spec.rb b/spec/system/assessor_interface/verifying_qualifications_spec.rb index 65dc504393..6fd6c77ba9 100644 --- a/spec/system/assessor_interface/verifying_qualifications_spec.rb +++ b/spec/system/assessor_interface/verifying_qualifications_spec.rb @@ -81,7 +81,7 @@ def given_there_is_an_application_form_with_qualification_request def and_i_see_a_waiting_on_status expect(assessor_application_page.status_summary.value).to have_text( - "WAITING ON QUALIFICATION", + "Waiting on qualification", ) end @@ -140,13 +140,13 @@ def when_i_go_back_to_overview def and_i_see_a_received_status expect(assessor_application_page.status_summary.value).to have_text( - "RECEIVED", + "Received", ) end def and_i_see_an_in_progress_status expect(assessor_application_page.status_summary.value).to have_text( - "ASSESSMENT IN PROGRESS", + "Assessment in progress", ) end diff --git a/spec/system/assessor_interface/verifying_references_spec.rb b/spec/system/assessor_interface/verifying_references_spec.rb index 6a47f8e5ed..df3b5a86d0 100644 --- a/spec/system/assessor_interface/verifying_references_spec.rb +++ b/spec/system/assessor_interface/verifying_references_spec.rb @@ -17,7 +17,7 @@ reference:, assessment_id:, ) - and_the_reference_request_status_is("RECEIVED") + and_the_reference_request_status_is("Received") when_i_click_on_the_reference_request then_i_see_the( @@ -33,7 +33,7 @@ reference:, assessment_id:, ) - and_the_reference_request_status_is("ACCEPTED") + and_the_reference_request_status_is("Accepted") when_i_click_on_the_reference_request then_i_see_the( @@ -55,7 +55,7 @@ reference:, assessment_id:, ) - and_the_reference_request_status_is("REVIEW") + and_the_reference_request_status_is("Review") when_i_verify_that_all_references_are_accepted then_i_see_the_verify_references_task_is_completed @@ -71,7 +71,7 @@ reference:, assessment_id:, ) - and_the_reference_request_status_is("OVERDUE") + and_the_reference_request_status_is("Overdue") when_i_click_on_the_reference_request then_i_see_the( @@ -92,7 +92,7 @@ reference:, assessment_id:, ) - and_the_reference_request_status_is("REVIEW") + and_the_reference_request_status_is("Review") when_i_verify_that_all_references_are_accepted then_i_see_the_verify_references_task_is_completed @@ -108,6 +108,12 @@ def given_the_reference_request_is_overdue reference_request.update!(expired_at: Time.zone.now, received_at: nil) end + def and_i_see_a_waiting_on_status + expect(assessor_application_page.status_summary.value).to have_text( + "Waiting on reference", + ) + end + def and_i_click_verify_references assessor_application_page.verify_references_task.link.click end @@ -195,6 +201,19 @@ def and_i_submit_an_internal_note assessor_verify_failed_reference_request_page.submit(note: "A note.") end + def then_i_see_the_reference_request_status_is_accepted + expect( + assessor_reference_requests_page + .task_list + .sections + .first + .items + .first + .status_tag + .text, + ).to eq("Completed") + end + def when_i_verify_that_all_references_are_accepted assessor_reference_requests_page.continue_button.click end @@ -209,7 +228,7 @@ def then_i_see_the_verify_references_task_is_completed .first .status_tag .text, - ).to eq("COMPLETED") + ).to eq("Completed") end def reference_request_task_item diff --git a/spec/system/support_interface/countries_spec.rb b/spec/system/support_interface/countries_spec.rb index e447adf042..94a547e13c 100644 --- a/spec/system/support_interface/countries_spec.rb +++ b/spec/system/support_interface/countries_spec.rb @@ -107,8 +107,8 @@ def then_i_see_country_changes_preview end def then_i_see_region_changes_confirmation - expect(page).to have_content("CREATE California") - expect(page).to have_content("DELETE Hawaii") + expect(page).to have_content("Create California") + expect(page).to have_content("Delete Hawaii") end def when_i_click_on_a_region diff --git a/spec/system/support_interface/staff_spec.rb b/spec/system/support_interface/staff_spec.rb index d32ff473ae..78d911ce9c 100644 --- a/spec/system/support_interface/staff_spec.rb +++ b/spec/system/support_interface/staff_spec.rb @@ -134,12 +134,12 @@ def then_i_see_an_invitation_email def then_i_see_the_invited_staff_user expect(page).to have_content("test@example.com") - expect(page).to have_content("NOT ACCEPTED") + expect(page).to have_content("Not accepted") end def then_i_see_the_accepted_staff_user expect(page).to have_content("test@example.com") - expect(page).to have_content("ACCEPTED") + expect(page).to have_content("Accepted") end def and_i_fill_name @@ -164,7 +164,7 @@ def and_i_set_password end def and_i_see_the_helpdesk_user - expect(page).to have_content("Support console access\tNO") + expect(page).to have_content("Support console access\tNo") end def when_i_click_on_the_helpdesk_user @@ -183,7 +183,7 @@ def and_i_submit_the_edit_form end def then_i_see_the_changed_permission - expect(page).to_not have_content("Support console access\tNO") + expect(page).to_not have_content("Support console access\tNo") end def then_i_am_taken_to_the_azure_login_page diff --git a/spec/system/teacher_interface/age_range_and_subjects_spec.rb b/spec/system/teacher_interface/age_range_and_subjects_spec.rb index 47fd194e52..24e2009f77 100644 --- a/spec/system/teacher_interface/age_range_and_subjects_spec.rb +++ b/spec/system/teacher_interface/age_range_and_subjects_spec.rb @@ -70,13 +70,13 @@ def when_i_fill_in_the_subjects def and_i_see_the_completed_age_range_task expect(teacher_application_page.age_range_task_item.status_tag.text).to eq( - "COMPLETED", + "Completed", ) end def and_i_see_the_completed_subjects_task expect(teacher_application_page.subjects_task_item.status_tag.text).to eq( - "COMPLETED", + "Completed", ) end diff --git a/spec/system/teacher_interface/further_information_spec.rb b/spec/system/teacher_interface/further_information_spec.rb index a34944f5f8..359b214fb2 100644 --- a/spec/system/teacher_interface/further_information_spec.rb +++ b/spec/system/teacher_interface/further_information_spec.rb @@ -81,23 +81,23 @@ def when_i_click_the_start_button end def and_i_see_the_text_task_list_item - expect(text_task_list_item.status_tag.text).to eq("NOT STARTED") + expect(text_task_list_item.status_tag.text).to eq("Not started") end def and_i_see_a_completed_text_task_list_item - expect(text_task_list_item.status_tag.text).to eq("COMPLETED") + expect(text_task_list_item.status_tag.text).to eq("Completed") end def and_i_see_the_document_task_list_item - expect(document_task_list_item.status_tag.text).to eq("NOT STARTED") + expect(document_task_list_item.status_tag.text).to eq("Not started") end def and_i_see_a_completed_document_task_list_item - expect(document_task_list_item.status_tag.text).to eq("COMPLETED") + expect(document_task_list_item.status_tag.text).to eq("Completed") end def and_i_see_the_completed_work_history_contact_list_item - expect(work_history_task_list_item.status_tag.text).to eq("COMPLETED") + expect(work_history_task_list_item.status_tag.text).to eq("Completed") end def when_i_click_the_text_task_list_item diff --git a/spec/system/teacher_interface/personal_information_spec.rb b/spec/system/teacher_interface/personal_information_spec.rb index 104051819e..cc6701c04f 100644 --- a/spec/system/teacher_interface/personal_information_spec.rb +++ b/spec/system/teacher_interface/personal_information_spec.rb @@ -196,7 +196,7 @@ def when_i_continue_from_check_page def and_i_see_the_completed_personal_information_task expect( teacher_application_page.personal_information_task_item.status_tag.text, - ).to eq("COMPLETED") + ).to eq("Completed") end def teacher diff --git a/spec/system/teacher_interface/registration_number_spec.rb b/spec/system/teacher_interface/registration_number_spec.rb index b61e33f292..e9832cefbc 100644 --- a/spec/system/teacher_interface/registration_number_spec.rb +++ b/spec/system/teacher_interface/registration_number_spec.rb @@ -45,7 +45,7 @@ def when_i_fill_in_the_registration_number def and_i_see_the_completed_registration_number_task expect( teacher_application_page.registration_number_task_item.status_tag.text, - ).to eq("COMPLETED") + ).to eq("Completed") end def teacher diff --git a/spec/system/teacher_interface/written_statement_spec.rb b/spec/system/teacher_interface/written_statement_spec.rb index d34430c2ef..c1e4c310c4 100644 --- a/spec/system/teacher_interface/written_statement_spec.rb +++ b/spec/system/teacher_interface/written_statement_spec.rb @@ -106,7 +106,7 @@ def and_i_see_the_upload_written_statement_task_is_completed .upload_written_statement_task_item .status_tag .text, - ).to eq("COMPLETED") + ).to eq("Completed") end def and_i_see_the_provide_written_statement_task @@ -133,7 +133,7 @@ def and_i_see_the_provide_written_statement_task_is_completed .provide_written_statement_task_item .status_tag .text, - ).to eq("COMPLETED") + ).to eq("Completed") end def teacher