Merge pull request #3210 from DFE-Digital/LUPEYALPHA-1059/update-ques…

…tion-text

LUPEYALPHA-1059/update-teaching-hours-question

config/locales/en.yml

@@ -895,8 +895,8 @@ en:
           teaching_hours_per_week:
             label: "Timetabled teaching hours"
             claimant_answers:
-              more_than_12: "More than 12 hours per week"
-              between_2_5_and_12: "Between 2.5 and 12 hours per week"
+              more_than_12: "12 hours or more per week"
+              between_2_5_and_12: "2.5 hours or more but less than 12 hours per week"
               less_than_2_5: "Less than 2.5 hours per week"
           half_teaching_hours:
             label: "Age range taught"
@@ -988,8 +988,8 @@ en:
           On average, how many hours per week are you timetabled to teach at %{school_name} during the current term?
         hint: ‘Timetabled teaching hours’ refers to the time you spend teaching lessons to students of all ages.
         options:
-          more_than_12: More than 12 hours per week
-          between_2_5_and_12: Between 2.5 and 12 hours per week
+          more_than_12: 12 hours or more per week
+          between_2_5_and_12: 2.5 hours or more but less than 12 hours per week
           less_than_2_5: Less than 2.5 hours per week
         errors:
           inclusion: Select the number of hours you are timetabled to teach per week at %{school_name} during the current term

spec/features/admin/admin_claim_further_education_payments_spec.rb

@@ -339,7 +339,7 @@
             end
 
             within_table_row("Timetabled teaching hours") do |claimant, provider|
-              expect(claimant).to have_text("More than 12 hours per week")
+              expect(claimant).to have_text("12 hours or more per week")
               expect(provider).to have_text("Yes")
             end
 
@@ -435,7 +435,7 @@
             end
 
             within_table_row("Timetabled teaching hours") do |claimant, provider|
-              expect(claimant).to have_text("More than 12 hours per week")
+              expect(claimant).to have_text("12 hours or more per week")
               expect(provider).to have_text("Yes")
             end
 

spec/features/admin/admin_view_full_claim_further_education_payments_spec.rb

@@ -102,7 +102,7 @@
           "On average, how many hours per week are you timetabled to teach at " \
           "Springfield Elementary during the current term?"
         )
-      ).to have_content("More than 12 hours per week")
+      ).to have_content("12 hours or more per week")
 
       expect(
         summary_row(

spec/features/further_education_payments/happy_js_path_spec.rb

@@ -33,7 +33,7 @@
     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("12 hours or more per week")
     click_button "Continue"
 
     expect(page).to have_content("Which academic year did you start teaching in further education (FE) in England?")

spec/features/further_education_payments/happy_path_spec.rb

@@ -32,7 +32,7 @@
     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("12 hours or more per week")
     click_button "Continue"
 
     expect(page).to have_content("Which academic year did you start teaching in further education (FE) in England?")

spec/features/further_education_payments/ineligible_paths_spec.rb

@@ -196,7 +196,7 @@
     click_button "Continue"
 
     expect(page).to have_content("On average, how many hours per week")
-    choose "More than 12 hours per week"
+    choose "12 hours or more per week"
     click_button "Continue"
 
     expect(page).to have_content("Which academic year did you start teaching in further education (FE) in England?")
@@ -267,7 +267,7 @@
     click_button "Continue"
 
     expect(page).to have_content("On average, how many hours per week")
-    choose "More than 12 hours per week"
+    choose "12 hours or more per week"
     click_button "Continue"
 
     expect(page).to have_content("Which academic year did you start teaching in further education (FE) in England?")
@@ -311,7 +311,7 @@
     click_button "Continue"
 
     expect(page).to have_content("On average, how many hours per week")
-    choose "More than 12 hours per week"
+    choose "12 hours or more per week"
     click_button "Continue"
 
     expect(page).to have_content("Which academic year did you start teaching in further education (FE) in England?")
@@ -359,7 +359,7 @@
     click_button "Continue"
 
     expect(page).to have_content("On average, how many hours per week are you timetabled to teach at #{eligible_college.name} during the current term?")
-    choose("More than 12 hours per week")
+    choose("12 hours or more per week")
     click_button "Continue"
 
     expect(page).to have_content("Which academic year did you start teaching in further education (FE) in England?")
@@ -395,7 +395,7 @@
     click_button "Continue"
 
     expect(page).to have_content("On average, how many hours per week are you timetabled to teach at #{eligible_college.name} during the current term?")
-    choose "More than 12 hours per week"
+    choose "12 hours or more per week"
     click_button "Continue"
 
     expect(page).to have_content("Which academic year did you start teaching in further education (FE) in England?")
@@ -461,7 +461,7 @@
     click_button "Continue"
 
     expect(page).to have_content("On average, how many hours per week are you timetabled to teach at #{eligible_college.name} during the current term?")
-    choose "More than 12 hours per week"
+    choose "12 hours or more per week"
     click_button "Continue"
 
     expect(page).to have_content("Which academic year did you start teaching in further education (FE) in England?")
@@ -527,7 +527,7 @@
     click_button "Continue"
 
     expect(page).to have_content("On average, how many hours per week are you timetabled to teach at #{eligible_college.name} during the current term?")
-    choose "More than 12 hours per week"
+    choose "12 hours or more per week"
     click_button "Continue"
 
     expect(page).to have_content("Which academic year did you start teaching in further education (FE) in England?")
@@ -619,7 +619,7 @@
     click_button "Continue"
 
     expect(page).to have_content("On average, how many hours per week are you timetabled to teach at #{eligible_college.name} during the current term?")
-    choose "More than 12 hours per week"
+    choose "12 hours or more per week"
     click_button "Continue"
 
     expect(page).to have_content("Are you timetabled to teach at least 2.5 hours per week at #{eligible_college.name} next term?")
@@ -659,7 +659,7 @@
     click_button "Continue"
 
     expect(page).to have_content("On average, how many hours per week are you timetabled to teach at #{eligible_college.name} during the current term?")
-    choose("More than 12 hours per week")
+    choose("12 hours or more per week")
     click_button "Continue"
 
     expect(page).to have_content("Are you timetabled to teach at least 2.5 hours per week at #{eligible_college.name} next term?")
@@ -695,7 +695,7 @@
     click_button "Continue"
 
     expect(page).to have_content("On average, how many hours per week are you timetabled to teach at #{eligible_college.name} during the current term?")
-    choose("More than 12 hours per week")
+    choose("12 hours or more per week")
     click_button "Continue"
 
     expect(page).to have_content("Which academic year did you start teaching in further education (FE) in England?")

spec/features/further_education_payments/provider/provider_verifying_claims_spec.rb

@@ -469,8 +469,8 @@
     end
 
     within_fieldset(
-      "Is Edna Krabappel timetabled to teach an average of more than 12 " \
-      "hours per week during the current term?"
+      "Is Edna Krabappel timetabled to teach an average of 12 hours or more " \
+      "per week during the current term?"
     ) do
       choose "Yes"
     end
@@ -600,8 +600,8 @@
     end
 
     within_fieldset(
-      "Is Edna Krabappel timetabled to teach an average of between 2.5 and " \
-      "12 hours per week during the current term?"
+      "Is Edna Krabappel timetabled to teach an average of 2.5 hours or " \
+      "more but less than 12 hours per week"
     ) do
       choose "Yes"
     end
@@ -740,8 +740,8 @@
     end
 
     within_fieldset(
-      "Is Edna Krabappel timetabled to teach an average of between 2.5 and " \
-      "12 hours per week during the current term?"
+      "Is Edna Krabappel timetabled to teach an average of 2.5 hours or " \
+      "more but less than 12 hours per week during the current term?"
     ) do
       choose "Yes"
     end

spec/forms/journeys/further_education_payments/provider/verify_claim_form_spec.rb

@@ -206,7 +206,7 @@
       context "when more that 12" do
         it do
           is_expected.not_to(allow_value(nil).for(:outcome).with_message(
-            "Select yes if Edna is timetabled to teach an average of more than 12 hours per week during the current term"
+            "Select yes if Edna is timetabled to teach an average of 12 hours or more per week during the current term"
           ))
         end
       end
@@ -216,7 +216,7 @@
 
         it do
           is_expected.not_to(allow_value(nil).for(:outcome).with_message(
-            "Select yes if Edna is timetabled to teach an average of between 2.5 and 12 hours per week during the current term"
+            "Select yes if Edna is timetabled to teach an average of 2.5 hours or more but less than 12 hours per week during the current term"
           ))
         end
       end

spec/models/journeys/further_education_payments/answers_presenter_spec.rb

@@ -119,7 +119,7 @@
           ["Are you a member of staff with teaching responsibilities?", "Yes", "teaching-responsibilities"],
           ["Which FE provider are you employed by?", college.name, "further-education-provision-search"],
           ["What type of contract do you have with #{college.name}?", "Permanent contract", "contract-type"],
-          ["On average, how many hours per week are you timetabled to teach at #{college.name} during the current term?", "More than 12 hours per week", "teaching-hours-per-week"],
+          ["On average, how many hours per week are you timetabled to teach at #{college.name} during the current term?", "12 hours or more per week", "teaching-hours-per-week"],
           ["Which academic year did you start teaching in further education (FE) in England?", "September 2023 to August 2024", "further-education-teaching-start-year"],
           ["Which subject areas do you teach?", "<p class=\"govuk-body\">Chemistry</p><p class=\"govuk-body\">Maths</p>", "subjects-taught"],
           ["Building and construction courses", "<p class=\"govuk-body\">Qualifications approved for funding at level 3 and below in the building and construction sector subject area</p><p class=\"govuk-body\">T Level in building services engineering for construction</p><p class=\"govuk-body\">T Level in onsite construction</p><p class=\"govuk-body\">T Level in design, surveying and planning for construction</p><p class=\"govuk-body\">Level 2 or level 3 apprenticeships in the construction and the built environment occupational route</p>", "building-construction-courses"],

spec/models/policies/further_education_payments/eligibility_admin_answers_presenter_spec.rb

@@ -83,7 +83,7 @@
             ],
             [
               "On average, how many hours per week are you timetabled to teach at Springfield Elementary during the current term?",
-              "More than 12 hours per week"
+              "12 hours or more per week"
             ]
           ]
         )
@@ -141,7 +141,7 @@
               ],
               [
                 "On average, how many hours per week are you timetabled to teach at Springfield Elementary during the current term?",
-                "Between 2.5 and 12 hours per week"
+                "2.5 hours or more but less than 12 hours per week"
               ],
               [
                 "Are you timetabled to teach at least 2.5 hours per week at Springfield Elementary next term?",
@@ -174,7 +174,7 @@
               ],
               [
                 "On average, how many hours per week are you timetabled to teach at Springfield Elementary during the current term?",
-                "Between 2.5 and 12 hours per week"
+                "2.5 hours or more but less than 12 hours per week"
               ],
               [
                 "Are you timetabled to teach at least 2.5 hours per week at Springfield Elementary next term?",