diff --git a/app/models/journeys/further_education_payments.rb b/app/models/journeys/further_education_payments.rb index 37010cca8b..8facc123c5 100644 --- a/app/models/journeys/further_education_payments.rb +++ b/app/models/journeys/further_education_payments.rb @@ -19,7 +19,7 @@ module FurtherEducationPayments "teaching-hours-per-week-next-term" => TeachingHoursPerWeekNextTermForm, "further-education-teaching-start-year" => FurtherEducationTeachingStartYearForm, "subjects-taught" => SubjectsTaughtForm, - "building-and-construction-courses" => BuildingConstructionCoursesForm, + "building-construction-courses" => BuildingConstructionCoursesForm, "chemistry-courses" => ChemistryCoursesForm, "computing-courses" => ComputingCoursesForm, "early-years-courses" => EarlyYearsCoursesForm, diff --git a/app/models/journeys/further_education_payments/slug_sequence.rb b/app/models/journeys/further_education_payments/slug_sequence.rb index cf0bcfd9af..fce721fa00 100644 --- a/app/models/journeys/further_education_payments/slug_sequence.rb +++ b/app/models/journeys/further_education_payments/slug_sequence.rb @@ -12,7 +12,7 @@ class SlugSequence teaching-hours-per-week-next-term further-education-teaching-start-year subjects-taught - building-and-construction-courses + building-construction-courses chemistry-courses computing-courses early-years-courses diff --git a/app/views/further_education_payments/claims/building_and_construction_courses.html.erb b/app/views/further_education_payments/claims/building_construction_courses.html.erb similarity index 100% rename from app/views/further_education_payments/claims/building_and_construction_courses.html.erb rename to app/views/further_education_payments/claims/building_construction_courses.html.erb diff --git a/spec/features/further_education_payments/ineligible_paths_spec.rb b/spec/features/further_education_payments/ineligible_paths_spec.rb index 2341c34454..bccaff0c29 100644 --- a/spec/features/further_education_payments/ineligible_paths_spec.rb +++ b/spec/features/further_education_payments/ineligible_paths_spec.rb @@ -225,22 +225,23 @@ click_button "Continue" expect(page).to have_content("What type of contract do you have with #{college.name}?") - choose("Permanent contract") + choose "Permanent contract" click_button "Continue" expect(page).to have_content("On average, how many hours per week are you timetabled to teach at #{college.name} during the current term?") - choose("More than 12 hours per week") + choose "More than 12 hours per week" click_button "Continue" expect(page).to have_content("Which academic year did you start teaching in further education (FE) in England?") - choose("September 2023 to August 2024") + choose "September 2023 to August 2024" click_button "Continue" expect(page).to have_content("Which subject areas do you teach?") - check("Building and construction") + check "Building and construction" click_button "Continue" - expect(page).to have_content("FE building and construction courses goes here") + expect(page).to have_content("Which building and construction courses do you teach?") + check "T Level in onsite construction" click_button "Continue" expect(page).to have_content("FE teaching courses goes here") @@ -288,22 +289,23 @@ click_button "Continue" expect(page).to have_content("What type of contract do you have with #{college.name}?") - choose("Permanent contract") + choose "Permanent contract" click_button "Continue" expect(page).to have_content("On average, how many hours per week are you timetabled to teach at #{college.name} during the current term?") - choose("More than 12 hours per week") + choose "More than 12 hours per week" click_button "Continue" expect(page).to have_content("Which academic year did you start teaching in further education (FE) in England?") - choose("September 2023 to August 2024") + choose "September 2023 to August 2024" click_button "Continue" expect(page).to have_content("Which subject areas do you teach?") - check("Building and construction") + check "Building and construction" click_button "Continue" - expect(page).to have_content("FE building and construction courses goes here") + expect(page).to have_content("Which building and construction courses do you teach?") + check "T Level in onsite construction" click_button "Continue" expect(page).to have_content("FE teaching courses goes here") @@ -351,22 +353,23 @@ click_button "Continue" expect(page).to have_content("What type of contract do you have with #{college.name}?") - choose("Permanent contract") + choose "Permanent contract" click_button "Continue" expect(page).to have_content("On average, how many hours per week are you timetabled to teach at #{college.name} during the current term?") - choose("More than 12 hours per week") + choose "More than 12 hours per week" click_button "Continue" expect(page).to have_content("Which academic year did you start teaching in further education (FE) in England?") - choose("September 2023 to August 2024") + choose "September 2023 to August 2024" click_button "Continue" expect(page).to have_content("Which subject areas do you teach?") - check("Building and construction") + check "Building and construction" click_button "Continue" - expect(page).to have_content("FE building and construction courses goes here") + expect(page).to have_content("Which building and construction courses do you teach?") + check "T Level in onsite construction" click_button "Continue" expect(page).to have_content("FE teaching courses goes here") @@ -404,7 +407,7 @@ click_button "Continue" expect(page).to have_content("What type of contract do you have with #{college.name}?") - choose("Permanent contract") + choose "Permanent contract" click_button "Continue" expect(page).to have_content("On average, how many hours per week are you timetabled to teach at #{college.name} during the current term?") @@ -435,15 +438,15 @@ click_button "Continue" expect(page).to have_content("What type of contract do you have with #{college.name}?") - choose("Fixed-term contract") + choose "Fixed-term contract" click_button "Continue" expect(page).to have_content("Does your fixed-term contract cover the full #{current_academic_year.to_s(:long)} academic year?") - choose("Yes, it covers the full #{current_academic_year.to_s(:long)} academic year") + choose "Yes, it covers the full #{current_academic_year.to_s(:long)} academic year" click_button "Continue" expect(page).to have_content("On average, how many hours per week are you timetabled to teach at #{college.name} during the current term?") - choose("More than 12 hours per week") + choose "More than 12 hours per week" click_button "Continue" expect(page).to have_content("Are you timetabled to teach at least 2.5 hours per week at #{college.name} next term?") @@ -525,10 +528,11 @@ click_button "Continue" expect(page).to have_content("Which subject areas do you teach?") - check("Building and construction") + check "Building and construction" click_button "Continue" - expect(page).to have_content("FE building and construction courses goes here") + expect(page).to have_content("Which building and construction courses do you teach?") + check "T Level in onsite construction" click_button "Continue" expect(page).to have_content("FE teaching courses goes here")