diff --git a/app/helpers/application_form_helper.rb b/app/helpers/application_form_helper.rb
index 6e3ae5233a..258e33f523 100644
--- a/app/helpers/application_form_helper.rb
+++ b/app/helpers/application_form_helper.rb
@@ -144,7 +144,13 @@ def application_form_summary_rows(
text: I18n.t("application_form.summary.status"),
},
value: {
- text: application_form_status_tag(application_form, class_context:),
+ text:
+ render(
+ StatusTag::Component.new(
+ application_form.statuses,
+ class_context:,
+ ),
+ ),
},
},
].compact
@@ -161,19 +167,4 @@ def application_form_display_work_history_before_teaching_qualification_banner?(
earliest_certificate_date.present? && earliest_work_history_date.present? &&
earliest_work_history_date < earliest_certificate_date
end
-
- private
-
- def application_form_status_tag(application_form, class_context:)
- statuses =
- if %w[overdue received waiting_on].include?(application_form.status)
- %w[further_information professional_standing qualification reference]
- .map { |requestable| "#{application_form.status}_#{requestable}" }
- .filter { |status| application_form.send(status) }
- else
- application_form.status
- end
-
- render(StatusTag::Component.new(statuses, class_context:))
- end
end
diff --git a/spec/helpers/application_form_helper_spec.rb b/spec/helpers/application_form_helper_spec.rb
index 77cdb189ba..0c6aaf611b 100644
--- a/spec/helpers/application_form_helper_spec.rb
+++ b/spec/helpers/application_form_helper_spec.rb
@@ -122,7 +122,7 @@
},
value: {
text:
- "Not started\n",
+ "Assessment not started\n",
},
},
],
diff --git a/spec/system/assessor_interface/awaiting_professional_standing_spec.rb b/spec/system/assessor_interface/awaiting_professional_standing_spec.rb
index 2b853f6db3..58f5d3b38f 100644
--- a/spec/system/assessor_interface/awaiting_professional_standing_spec.rb
+++ b/spec/system/assessor_interface/awaiting_professional_standing_spec.rb
@@ -32,7 +32,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(
- "WAITING ON PROFESSIONAL STANDING",
+ "WAITING ON LOPS",
)
end
@@ -71,6 +71,7 @@ def application_form
:application_form,
:waiting_on,
waiting_on_professional_standing: true,
+ statuses: %w[waiting_on_lops],
assessment: create(:assessment, :with_professional_standing_request),
teaching_authority_provides_written_statement: true,
)
diff --git a/spec/system/assessor_interface/verifying_professional_standing_spec.rb b/spec/system/assessor_interface/verifying_professional_standing_spec.rb
index 0ed8b851e5..f281aa0cf4 100644
--- a/spec/system/assessor_interface/verifying_professional_standing_spec.rb
+++ b/spec/system/assessor_interface/verifying_professional_standing_spec.rb
@@ -40,7 +40,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(
- "WAITING ON PROFESSIONAL STANDING",
+ "WAITING ON LOPS",
)
end
@@ -75,7 +75,7 @@ def when_i_fill_in_the_review_form
def and_i_see_a_received_status
expect(assessor_application_page.status_summary.value).to have_text(
- "RECEIVED PROFESSIONAL STANDING",
+ "RECEIVED LOPS",
)
end
@@ -87,6 +87,7 @@ def application_form
:application_form,
:waiting_on,
waiting_on_professional_standing: true,
+ statuses: %w[waiting_on_lops],
)
create(
:assessment,