Skip to content

Commit

Permalink
fix rebasing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
asmega committed Jul 15, 2024
1 parent fcf17e6 commit bcf6f86
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 23 deletions.
2 changes: 1 addition & 1 deletion app/models/journeys/further_education_payments.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
46 changes: 25 additions & 21 deletions spec/features/further_education_payments/ineligible_paths_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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?")
Expand Down Expand Up @@ -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?")
Expand Down Expand Up @@ -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")
Expand Down

0 comments on commit bcf6f86

Please sign in to comment.