Merge pull request #1765 from DFE-Digital/application-id

Remove references to application_id
DFE-Digital · Oct 16, 2023 · 2cfcc05 · 2cfcc05
2 parents 83dccbe + 97b245e
commit 2cfcc05
Show file tree

Hide file tree

Showing 59 changed files with 210 additions and 251 deletions.
diff --git a/...oad/page_objects/assessor_interface/age_range_subjects_assessment_recommendation_award.rb b/...oad/page_objects/assessor_interface/age_range_subjects_assessment_recommendation_award.rb
@@ -3,7 +3,7 @@
 module PageObjects
   module AssessorInterface
     class AgeRangeSubjectsAssessmentRecommendationAward < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/recommendation/award/age-range-subjects"
 
       element :heading, "h1"

diff --git a/spec/support/autoload/page_objects/assessor_interface/application.rb b/spec/support/autoload/page_objects/assessor_interface/application.rb
@@ -3,7 +3,7 @@
 module PageObjects
   module AssessorInterface
     class Application < SitePrism::Page
-      set_url "/assessor/applications/{application_id}"
+      set_url "/assessor/applications/{application_form_id}"
 
       element :back_link, "a", text: "Back"
 

diff --git a/spec/support/autoload/page_objects/assessor_interface/application_status.rb b/spec/support/autoload/page_objects/assessor_interface/application_status.rb
@@ -1,7 +1,7 @@
 module PageObjects
   module AssessorInterface
     class ApplicationStatus < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/status"
+      set_url "/assessor/applications/{application_form_id}/status"
 
       element :back_link, "a", text: "Back"
 

diff --git a/spec/support/autoload/page_objects/assessor_interface/assessment_section.rb b/spec/support/autoload/page_objects/assessor_interface/assessment_section.rb
@@ -1,7 +1,7 @@
 module PageObjects
   module AssessorInterface
     class AssessmentSection < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}/sections/{section_id}"
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}/sections/{section_id}"
 
       element :heading, "h1"
 

diff --git a/spec/support/autoload/page_objects/assessor_interface/assign_assessor.rb b/spec/support/autoload/page_objects/assessor_interface/assign_assessor.rb
@@ -1,7 +1,7 @@
 module PageObjects
   module AssessorInterface
     class AssignAssessor < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assign-assessor"
+      set_url "/assessor/applications/{application_form_id}/assign-assessor"
 
       element :heading, "h1"
       sections :assessors, PageObjects::GovukRadioItem, ".govuk-radios__item"

diff --git a/spec/support/autoload/page_objects/assessor_interface/assign_reviewer.rb b/spec/support/autoload/page_objects/assessor_interface/assign_reviewer.rb
@@ -1,7 +1,7 @@
 module PageObjects
   module AssessorInterface
     class AssignReviewer < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assign-reviewer"
+      set_url "/assessor/applications/{application_form_id}/assign-reviewer"
 
       element :heading, "h1"
       sections :reviewers, PageObjects::GovukRadioItem, ".govuk-radios__item"

diff --git a/spec/support/autoload/page_objects/assessor_interface/check_english_language_proficiency.rb b/spec/support/autoload/page_objects/assessor_interface/check_english_language_proficiency.rb
@@ -5,7 +5,7 @@ class EnglishLanguageProficiencyCard < SitePrism::Section
     end
 
     class CheckEnglishLanguageProficiency < AssessmentSection
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}/sections/{section_id}"
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}/sections/{section_id}"
 
       sections :cards, EnglishLanguageProficiencyCard, ".govuk-summary-card"
 

diff --git a/spec/support/autoload/page_objects/assessor_interface/check_personal_information.rb b/spec/support/autoload/page_objects/assessor_interface/check_personal_information.rb
@@ -9,7 +9,7 @@ class PersonalInformationCard < SitePrism::Section
     end
 
     class CheckPersonalInformation < AssessmentSection
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}/sections/{section_id}"
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}/sections/{section_id}"
 
       sections :cards, PersonalInformationCard, ".govuk-summary-card"
 

diff --git a/spec/support/autoload/page_objects/assessor_interface/check_professional_standing.rb b/spec/support/autoload/page_objects/assessor_interface/check_professional_standing.rb
@@ -7,7 +7,7 @@ class ProfessionalStandingCard < SitePrism::Section
     end
 
     class CheckProfessionalStanding < AssessmentSection
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}/sections/{section_id}"
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}/sections/{section_id}"
 
       sections :cards, ProfessionalStandingCard, ".govuk-summary-card"
 

diff --git a/spec/support/autoload/page_objects/assessor_interface/check_qualifications.rb b/spec/support/autoload/page_objects/assessor_interface/check_qualifications.rb
@@ -7,7 +7,7 @@ class QualificationCard < SitePrism::Section
     end
 
     class CheckQualifications < AssessmentSection
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}/sections/{section_id}"
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}/sections/{section_id}"
 
       sections :cards, QualificationCard, ".govuk-summary-card"
 

diff --git a/spec/support/autoload/page_objects/assessor_interface/check_work_history.rb b/spec/support/autoload/page_objects/assessor_interface/check_work_history.rb
@@ -7,7 +7,7 @@ class WorkHistoryCard < GovukSummaryCard
     end
 
     class CheckWorkHistory < AssessmentSection
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}/sections/{section_id}"
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}/sections/{section_id}"
 
       sections :cards, WorkHistoryCard, ".govuk-summary-card"
 

diff --git a/spec/support/autoload/page_objects/assessor_interface/complete_assessment.rb b/spec/support/autoload/page_objects/assessor_interface/complete_assessment.rb
@@ -1,7 +1,7 @@
 module PageObjects
   module AssessorInterface
     class CompleteAssessment < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}/edit"
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}/edit"
 
       element :heading, "h1"
       sections :new_states, GovukRadioItem, ".govuk-radios__item"

diff --git a/spec/support/autoload/page_objects/assessor_interface/confirm_assessment_recommendation.rb b/spec/support/autoload/page_objects/assessor_interface/confirm_assessment_recommendation.rb
@@ -1,7 +1,7 @@
 module PageObjects
   module AssessorInterface
     class ConfirmAssessmentRecommendation < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/recommendation/{recommendation}/confirm"
 
       element :heading, "h1"

diff --git a/...ects/assessor_interface/contact_professional_standing_assessment_recommendation_verify.rb b/...ects/assessor_interface/contact_professional_standing_assessment_recommendation_verify.rb
@@ -3,7 +3,7 @@
 module PageObjects
   module AssessorInterface
     class ContactProfessionalStandingAssessmentRecommendationVerify < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/recommendation/verify/contact-professional-standing"
 
       element :heading, "h1"

diff --git a/spec/support/autoload/page_objects/assessor_interface/create_note.rb b/spec/support/autoload/page_objects/assessor_interface/create_note.rb
@@ -1,7 +1,7 @@
 module PageObjects
   module AssessorInterface
     class CreateNote < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/notes/new"
+      set_url "/assessor/applications/{application_form_id}/notes/new"
 
       element :heading, "h1"
 

diff --git a/spec/support/autoload/page_objects/assessor_interface/declare_assessment_recommendation.rb b/spec/support/autoload/page_objects/assessor_interface/declare_assessment_recommendation.rb
@@ -1,7 +1,7 @@
 module PageObjects
   module AssessorInterface
     class DeclareAssessmentRecommendation < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/recommendation/{recommendation}/edit"
 
       element :heading, "h1"

diff --git a/...age_objects/assessor_interface/edit_age_range_subjects_assessment_recommendation_award.rb b/...age_objects/assessor_interface/edit_age_range_subjects_assessment_recommendation_award.rb
@@ -3,7 +3,7 @@
 module PageObjects
   module AssessorInterface
     class EditAgeRangeSubjectsAssessmentRecommendationAward < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/recommendation/award/age-range-subjects/edit"
 
       element :heading, "h1"

diff --git a/spec/support/autoload/page_objects/assessor_interface/edit_qualification_request.rb b/spec/support/autoload/page_objects/assessor_interface/edit_qualification_request.rb
@@ -3,7 +3,7 @@
 module PageObjects
   module AssessorInterface
     class EditQualificationRequest < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/qualification-requests/{id}/edit"
 
       section :form, "form" do

diff --git a/spec/support/autoload/page_objects/assessor_interface/edit_reference_request.rb b/spec/support/autoload/page_objects/assessor_interface/edit_reference_request.rb
@@ -3,7 +3,7 @@
 module PageObjects
   module AssessorInterface
     class EditReferenceRequest < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/reference-requests/{id}/edit"
 
       section :summary_list, GovukSummaryList, "#reference-details-summary-list"

diff --git a/...page_objects/assessor_interface/email_consent_letters_assessment_recommendation_verify.rb b/...page_objects/assessor_interface/email_consent_letters_assessment_recommendation_verify.rb
@@ -3,7 +3,7 @@
 module PageObjects
   module AssessorInterface
     class EmailConsentLettersAssessmentRecommendationVerify < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/recommendation/verify/email-consent-letters"
 
       element :heading, "h1"

diff --git a/spec/support/autoload/page_objects/assessor_interface/further_information_request.rb b/spec/support/autoload/page_objects/assessor_interface/further_information_request.rb
@@ -1,7 +1,7 @@
 module PageObjects
   module AssessorInterface
     class FurtherInformationRequest < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/further-information-requests/{further_information_request_id}"
     end
   end

diff --git a/spec/support/autoload/page_objects/assessor_interface/further_information_request_preview.rb b/spec/support/autoload/page_objects/assessor_interface/further_information_request_preview.rb
@@ -1,7 +1,8 @@
 module PageObjects
   module AssessorInterface
     class FurtherInformationRequestPreview < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}/further-information-requests/new"
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
+                "/further-information-requests/new"
 
       element :email_preview, "div.app-email-preview"
 

diff --git a/spec/support/autoload/page_objects/assessor_interface/preview_assessment_recommendation.rb b/spec/support/autoload/page_objects/assessor_interface/preview_assessment_recommendation.rb
@@ -1,7 +1,7 @@
 module PageObjects
   module AssessorInterface
     class PreviewAssessmentRecommendation < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/recommendation/{recommendation}/preview"
 
       element :heading, "h1"

diff --git a/...toload/page_objects/assessor_interface/preview_referee_assessment_recommendation_award.rb b/...toload/page_objects/assessor_interface/preview_referee_assessment_recommendation_award.rb
@@ -3,7 +3,7 @@
 module PageObjects
   module AssessorInterface
     class PreviewRefereeAssessmentRecommendationAward < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/recommendation/verify/preview-referee"
 
       element :heading, "h1"

diff --git a/...toload/page_objects/assessor_interface/preview_teacher_assessment_recommendation_award.rb b/...toload/page_objects/assessor_interface/preview_teacher_assessment_recommendation_award.rb
@@ -3,7 +3,7 @@
 module PageObjects
   module AssessorInterface
     class PreviewTeacherAssessmentRecommendationAward < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/recommendation/verify/preview-teacher"
 
       element :heading, "h1"

diff --git a/spec/support/autoload/page_objects/assessor_interface/qualification_requests.rb b/spec/support/autoload/page_objects/assessor_interface/qualification_requests.rb
@@ -3,7 +3,7 @@
 module PageObjects
   module AssessorInterface
     class QualificationRequests < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/qualification-requests"
 
       section :task_list, ".app-task-list__item" do

diff --git a/...age_objects/assessor_interface/qualification_requests_assessment_recommendation_verify.rb b/...age_objects/assessor_interface/qualification_requests_assessment_recommendation_verify.rb
@@ -3,7 +3,7 @@
 module PageObjects
   module AssessorInterface
     class QualificationRequestsAssessmentRecommendationVerify < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/recommendation/verify/qualification-requests"
 
       element :heading, "h1"

diff --git a/spec/support/autoload/page_objects/assessor_interface/reference_requests.rb b/spec/support/autoload/page_objects/assessor_interface/reference_requests.rb
@@ -3,7 +3,7 @@
 module PageObjects
   module AssessorInterface
     class ReferenceRequests < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/reference-requests"
 
       section :task_list, ".app-task-list__item" do

diff --git a/...ad/page_objects/assessor_interface/reference_requests_assessment_recommendation_verify.rb b/...ad/page_objects/assessor_interface/reference_requests_assessment_recommendation_verify.rb
@@ -3,7 +3,7 @@
 module PageObjects
   module AssessorInterface
     class ReferenceRequestsAssessmentRecommendationVerify < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/recommendation/verify/reference-requests"
 
       element :heading, "h1"

diff --git a/spec/support/autoload/page_objects/assessor_interface/request_further_information.rb b/spec/support/autoload/page_objects/assessor_interface/request_further_information.rb
@@ -1,7 +1,8 @@
 module PageObjects
   module AssessorInterface
     class RequestFurtherInformation < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}/further-information-requests/preview"
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
+                "/further-information-requests/preview"
 
       sections :items, ".app-further-information-request-item" do
         element :heading, ".govuk-heading-s"

diff --git a/spec/support/autoload/page_objects/assessor_interface/review_further_information_request.rb b/spec/support/autoload/page_objects/assessor_interface/review_further_information_request.rb
@@ -1,7 +1,7 @@
 module PageObjects
   module AssessorInterface
     class ReviewFurtherInformationRequest < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/further-information-requests/{further_information_request_id}/edit"
 
       element :heading, ".govuk-heading-xl"

diff --git a/spec/support/autoload/page_objects/assessor_interface/timeline.rb b/spec/support/autoload/page_objects/assessor_interface/timeline.rb
@@ -1,7 +1,7 @@
 module PageObjects
   module AssessorInterface
     class Timeline < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/timeline_events"
+      set_url "/assessor/applications/{application_form_id}/timeline_events"
 
       element :heading, "h1"
       sections :timeline_items, MojTimelineItem, ".moj-timeline__item"

diff --git a/spec/support/autoload/page_objects/assessor_interface/verify_age_range_subjects_page.rb b/spec/support/autoload/page_objects/assessor_interface/verify_age_range_subjects_page.rb
@@ -7,7 +7,7 @@ class AgeRangeSubjectCard < SitePrism::Section
     end
 
     class VerifyAgeRangeSubjectsPage < AssessmentSection
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}/sections/{section_id}"
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}/sections/{section_id}"
 
       sections :cards, AgeRangeSubjectCard, ".govuk-summary-card"
 

diff --git a/...jects/assessor_interface/verify_professional_standing_assessment_recommendation_verify.rb b/...jects/assessor_interface/verify_professional_standing_assessment_recommendation_verify.rb
@@ -3,7 +3,7 @@
 module PageObjects
   module AssessorInterface
     class VerifyProfessionalStandingAssessmentRecommendationVerify < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/recommendation/verify/verify-professional-standing"
 
       element :heading, "h1"

diff --git a/...page_objects/assessor_interface/verify_qualifications_assessment_recommendation_verify.rb b/...page_objects/assessor_interface/verify_qualifications_assessment_recommendation_verify.rb
@@ -3,7 +3,7 @@
 module PageObjects
   module AssessorInterface
     class VerifyQualificationsAssessmentRecommendationVerify < SitePrism::Page
-      set_url "/assessor/applications/{application_id}/assessments/{assessment_id}" \
+      set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \
                 "/recommendation/verify/verify-qualifications"
 
       element :heading, "h1"

diff --git a/spec/support/autoload/page_objects/teacher_interface/check_uploaded_files.rb b/spec/support/autoload/page_objects/teacher_interface/check_uploaded_files.rb
@@ -1,7 +1,7 @@
 module PageObjects
   module TeacherInterface
     class CheckUploadedFiles < SitePrism::Page
-      set_url "/teacher/application/documents/{application_id}/edit"
+      set_url "/teacher/application/documents/{application_form_id}/edit"
 
       element :heading, "h1"
       element :files, ".govuk-grid-row .govuk-grid-column-two-thirds"

diff --git a/spec/support/autoload/page_objects/teacher_interface/document_available.rb b/spec/support/autoload/page_objects/teacher_interface/document_available.rb
@@ -3,7 +3,7 @@
 module PageObjects
   module TeacherInterface
     class DocumentAvailable < SitePrism::Page
-      set_url "/teacher/application/documents/{application_id}/edit"
+      set_url "/teacher/application/documents/{application_form_id}/edit"
 
       element :heading, "h1"
 

diff --git a/spec/support/page_helpers.rb b/spec/support/page_helpers.rb
@@ -87,6 +87,11 @@ def assessor_contact_professional_standing_assessment_recommendation_verify_page
       PageObjects::AssessorInterface::ContactProfessionalStandingAssessmentRecommendationVerify.new
   end
 
+  def assessor_create_note_page
+    @assessor_create_note_page ||=
+      PageObjects::AssessorInterface::CreateNote.new
+  end
+
   def assessor_declare_assessment_recommendation_page
     @assessor_declare_assessment_recommendation_page ||=
       PageObjects::AssessorInterface::DeclareAssessmentRecommendation.new
@@ -201,11 +206,6 @@ def assessor_review_verifications_page
       PageObjects::AssessorInterface::ReviewVerifications.new
   end
 
-  def assessor_qualified_for_subject_page
-    @assessor_qualified_for_subject_page ||=
-      PageObjects::AssessorInterface::CreateNote.new
-  end
-
   def assessor_timeline_page
     @assessor_timeline_page ||= PageObjects::AssessorInterface::Timeline.new
   end