diff --git a/Gemfile.lock b/Gemfile.lock index 61cedf85f3..b217f0f068 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -211,14 +211,14 @@ GEM dotenv-rails (3.1.2) dotenv (= 3.1.2) railties (>= 6.1) - erb_lint (0.5.0) + erb_lint (0.7.0) activesupport better_html (>= 2.0.1) parser (>= 2.7.1.4) rainbow - rubocop + rubocop (>= 1) smart_properties - erubi (1.13.0) + erubi (1.13.1) et-orbi (1.2.11) tzinfo factory_bot (6.5.0) @@ -336,7 +336,7 @@ GEM invisible_captcha (2.3.0) rails (>= 5.2) iso_country_codes (0.7.8) - json (2.7.2) + json (2.9.1) jwt (2.7.1) kaminari (1.2.2) activesupport (>= 4.1.0) @@ -363,7 +363,7 @@ GEM loaf (0.10.0) railties (>= 3.2) logger (1.6.0) - loofah (2.23.1) + loofah (2.24.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -382,7 +382,7 @@ GEM method_source (1.1.0) mini_mime (1.1.5) mini_portile2 (2.8.8) - minitest (5.25.2) + minitest (5.25.4) mixlib-cli (2.1.8) mixlib-config (3.0.27) tomlrb @@ -410,8 +410,8 @@ GEM os (1.1.4) package_json (0.1.0) pagy (9.0.5) - parallel (1.25.1) - parser (3.3.4.0) + parallel (1.26.3) + parser (3.3.6.0) ast (~> 2.4.1) racc pg (1.5.4) @@ -487,7 +487,7 @@ GEM redis (>= 3, < 6) redlock (1.3.2) redis (>= 3.0.0, < 6.0) - regexp_parser (2.9.2) + regexp_parser (2.10.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -606,7 +606,7 @@ GEM spring (>= 4) stoplight (3.0.2) redlock (~> 1.0) - strscan (3.1.0) + strscan (3.1.2) text (1.3.1) thor (1.3.2) timeliness (0.4.5) @@ -616,7 +616,7 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) vcr (6.3.1) base64 victor (0.3.4) diff --git a/app/views/content/funding-and-support/salaried-teacher-training.md b/app/views/content/funding-and-support/salaried-teacher-training.md index 17915fd436..ca695bc8bb 100644 --- a/app/views/content/funding-and-support/salaried-teacher-training.md +++ b/app/views/content/funding-and-support/salaried-teacher-training.md @@ -1,5 +1,5 @@ --- -title: "Salaried teacher training" +title: "Postgraduate salaried teacher training" subcategory: Courses with a salary description: |- Explore salaried teacher training, including School Direct salaried courses, postgraduate teaching apprenticeships and training delivered by Teach First. @@ -28,10 +28,10 @@ expander: title: salaried teacher training text: |-
- You can apply for a salaried teacher training course. However, these courses are limited in number and very competitive. On this type of course, you will not pay a fee, and you can earn money while you train in a school. + You can apply for a salaried teacher training course. However, these courses are limited in number and very competitive. On this type of course you can earn money while you train in a school. Some salaried courses may also charge fees.
- You will also need a visa or immigration status allowing you to work in the UK.
+ You'll also need a visa or immigration status allowing you to work in the UK. quote: nathan: text: "From the outset I was working within the school, learning and training in the classroom whilst being supported by qualified teachers and mentors. This gave me valuable experience of school life and a real feel for school." @@ -41,19 +41,25 @@ quote: There are some teacher training courses that come with a salary. -This means you will not have to pay tuition fees and will receive a salary while you train to get [qualified teacher status (QTS)](/train-to-be-a-teacher/what-is-qts). This is what you need to teach in many primary, secondary and special schools in England. +This means you'll be paid a salary while you train to get [qualified teacher status (QTS)](/train-to-be-a-teacher/what-is-qts). You'll need QTS to teach in many primary, secondary and special schools in England. -The main salaried courses include School Direct salaried, postgraduate teaching apprenticeships (PGTA) and teacher training delivered by Teach First. +Some salaried teacher training courses may also come with fees. Check with individual providers for more information. + +The postgraduate salaried courses are: + +* School Direct salaried +* postgraduate teaching apprenticeships (PGTA) +* Teach First teacher training All salaried courses are broadly the same, but the course length and qualifications you work towards may vary. These courses are in high demand and very competitive, so it’s important to apply as soon as you can if you’re eligible. -## Am I eligible for a salaried teacher training course? +## Am I eligible for a postgraduate salaried teacher training course? -For some salaried courses, teacher training providers may want you to have significant teaching or school experience (for example, if you’re already working as an unqualified teacher or teaching assistant). +For some salaried courses, teacher training providers may want you to have significant teaching or school experience, for example, if you’re already working as an unqualified teacher or teaching assistant. -Some also want you to have already arranged a school to work in while you train. Speak to the teacher training provider to find out what their requirements are. +Some providers will also want you to have already arranged a school to work in while you train. Speak to the teacher training provider to find out what their requirements are. You can also [find out more about the qualifications you need to train to teach](/train-to-be-a-teacher/qualifications-you-need-to-teach). @@ -61,9 +67,13 @@ Or talk to a [teacher training adviser](/teacher-training-advisers) who can help $salaried-teacher-training$ +### If you do not have a degree + +If you do not already have a degree, you may be eligible for a [teacher degree apprenticeship (TDA)](/train-to-be-a-teacher/teacher-degree-apprenticeships). A TDA is an undergraduate teacher training course where you’ll work in a school and earn a salary while getting a degree and QTS. + ## How much will I be paid on a salaried course? -You'll receive an [unqualified teacher’s salary](/life-as-a-teacher/pay-and-benefits/teacher-pay) – the exact amount will vary depending on the school you work in. +You'll receive an [unqualified teacher’s salary](/life-as-a-teacher/pay-and-benefits/teacher-pay). The exact amount will vary depending on the school you work in. It’s worth checking if there is a [bursary or scholarship](/funding-and-support/scholarships-and-bursaries) available for your subject before you apply for a salaried course. @@ -73,11 +83,11 @@ If you’re eligible for a bursary or scholarship, you could receive more money ## How does salaried teacher training work? -Salaried teacher training is usually similar to non-salaried teacher training – you'll spend most of your time in school placements, with some theoretical learning. +Salaried teacher training is usually similar to non-salaried teacher training. You'll spend most of your time in school placements, with some theoretical learning. $nathan$ -You will not perform more than 90% of a full-time teacher’s duties (unless you’re on a postgraduate teaching apprenticeship, in which case it’s 80%). +You will not perform more than 90% of a full-time teacher’s duties on most salaried teacher training courses. If you're doing a postgraduate teaching apprenticeship, you'll perform no more than 80% of a full-time teacher's duties. Full-time salaried teacher training will usually last: @@ -85,7 +95,7 @@ Full-time salaried teacher training will usually last: * 2 academic years (September to July) if you’re on a course delivered by Teach First -* at least 1 full year (September to September) if you’re on a postgraduate teaching apprenticeship – apprenticeships must last a minimum of 12 months +* at least 1 full year (September to September) if you’re on a postgraduate teaching apprenticeship Some courses can begin at other points in the year and there may be part-time courses available. @@ -105,4 +115,4 @@ Teach First delivers a 2 year employment-based route to teaching for high perfor To apply and find out more, you should [visit the Teach First website](https://www.teachfirst.org.uk/). -$adviser$ \ No newline at end of file +$adviser$ diff --git a/app/views/content/funding-and-support/scholarships-and-bursaries.md b/app/views/content/funding-and-support/scholarships-and-bursaries.md index 5a8d495ebb..d4657cbad5 100644 --- a/app/views/content/funding-and-support/scholarships-and-bursaries.md +++ b/app/views/content/funding-and-support/scholarships-and-bursaries.md @@ -111,6 +111,8 @@ Find out more about the [subjects you could teach](/life-as-a-teacher/explore-su If you're not eligible for a bursary or scholarship, there may be other funding options available, such as [tuition fees and maintenance loans](/funding-and-support/tuition-fees). +You may be eligible for [a salaried teacher training course](/funding-and-support/salaried-teacher-training) which means you'll get paid while you train to teach. Some salaried teacher training courses may also come with fees. Check with individual providers for more information. + For advice on funding, you can speak to a [teacher training adviser](/teacher-training-advisers). They can help you work out what support you could be eligible for. $adviser$ \ No newline at end of file diff --git a/app/views/content/landing/how-much-do-teachers-get-paid/_collage.html.erb b/app/views/content/landing/how-much-do-teachers-get-paid/_collage.html.erb index 717ffa301d..adb967105d 100644 --- a/app/views/content/landing/how-much-do-teachers-get-paid/_collage.html.erb +++ b/app/views/content/landing/how-much-do-teachers-get-paid/_collage.html.erb @@ -3,7 +3,7 @@- A rewarding salary, substantial pension, and generous + A rewarding salary, secure pension, and generous holidays are just some of the great benefits of a career in teaching.
diff --git a/app/views/content/life-as-a-teacher/change-careers/how-to-change-careers-to-become-a-teacher/_article.html.erb b/app/views/content/life-as-a-teacher/change-careers/how-to-change-careers-to-become-a-teacher/_article.html.erb index d67d916fc8..9bd41f65cb 100644 --- a/app/views/content/life-as-a-teacher/change-careers/how-to-change-careers-to-become-a-teacher/_article.html.erb +++ b/app/views/content/life-as-a-teacher/change-careers/how-to-change-careers-to-become-a-teacher/_article.html.erb @@ -8,7 +8,7 @@It does not matter when you graduated, and your degree subject does not necessarily need to be in the subject you want to teach. Once you have QTS, you can also teach any other subject, as long as you can show you have enough expertise.
Most postgraduate teacher training courses charge fees. There are ways to fund your training, for example, through tuition fee and maintenance loans. If you train to teach certain subjects, you may also be eligible for a bursary or scholarship of up to <%= v :scholarships_generic_maxshortened %>.
-Other postgraduate teacher training courses come with a salary. This means you will not pay tuition fees and will receive a salary while you train. These courses are in high demand and very competitive, so it’s important to apply as soon as you can if you’re eligible.
+Other postgraduate teacher training courses come with a salary, which means you get paid while you train. Some salaried courses may also charge fees. These courses are in high demand and very competitive, so it’s important to apply as soon as you can if you’re eligible.
If you’re eligible for a bursary or scholarship, you could receive more money on a non-salaried course than on a salaried one.
Find out more about postgraduate teacher training.
In addition to the personal rewards of teaching <%= @front_matter["subject"] %>, there are practical benefits too, including:
In addition to the personal rewards of teaching, there are practical benefits too, including:
- You can apply for a salaried teacher training course. However, places on these courses are limited and very competitive. + You can apply for a salaried teacher training course. However, places on these courses are limited and very competitive. Some salaried courses may also charge fees.
Before you apply, contact the salaried teacher training provider to check you meet the entry requirements. @@ -116,7 +116,7 @@ $fee-funded-teacher-training$ ### Salaried teacher training -Some courses are salaried, which means you’ll receive an unqualified teacher’s salary while you train. +Some courses are salaried, which means you’ll receive an unqualified teacher’s salary while you train. Some salaried teacher training courses may also come with fees. Check with individual providers for more information. Places on salaried courses are limited and very competitive. diff --git a/app/views/content/train-to-be-a-teacher/qualifications-you-need-to-teach.md b/app/views/content/train-to-be-a-teacher/qualifications-you-need-to-teach.md index 2ac992c9f4..af772f014b 100644 --- a/app/views/content/train-to-be-a-teacher/qualifications-you-need-to-teach.md +++ b/app/views/content/train-to-be-a-teacher/qualifications-you-need-to-teach.md @@ -32,6 +32,8 @@ You need [qualified teacher status (QTS)](/train-to-be-a-teacher/what-is-qts) to You do not need QTS to [teach in further education](/life-as-a-teacher/age-groups-and-specialisms/further-education-teachers) or to [teach in early years](/life-as-a-teacher/age-groups-and-specialisms/early-years-teachers). +You do not need a [postgraduate certificate in education (PGCE)](/train-to-be-a-teacher/what-is-a-pgce) to be a qualified teacher in England, but it can help you develop your teaching skills and knowledge. + ## What qualifications do you need to train? To train to teach in primary and secondary schools in England, you’ll need: diff --git a/app/views/content/train-to-be-a-teacher/what-is-a-pgce.md b/app/views/content/train-to-be-a-teacher/what-is-a-pgce.md index 50e9a590bf..c4d729e17e 100644 --- a/app/views/content/train-to-be-a-teacher/what-is-a-pgce.md +++ b/app/views/content/train-to-be-a-teacher/what-is-a-pgce.md @@ -37,9 +37,11 @@ expander: link_url: /non-uk-teachers/non-uk-qualifications --- -A postgraduate certificate in education (PGCE) is an academic qualification. You can get this through teacher training. +If you have a degree and are interested in gaining a qualification in education, you may want to do a postgraduate certificate in education (PGCE). -You do not need one to be a qualified teacher in England, but it can help you develop your teaching skills and knowledge. +You can get a postgraduate certificate in education through teacher training. + +You do not need a PGCE to be a qualified teacher in England, but it can help you develop your teaching skills and knowledge. ## The qualifications you need to teach in England @@ -47,7 +49,7 @@ You need qualified teacher status (QTS) to teach in most primary, secondary and [Find out more about qualified teacher status (QTS)](/train-to-be-a-teacher/what-is-qts). -Many teacher training courses also offer you a postgraduate qualification such as a PGCE, but you do not need one to teach. +Many teacher training courses also offer a postgraduate qualification, such as a PGCE, but you do not need one to teach. ## Teacher training courses @@ -59,7 +61,7 @@ You can do a teacher training course that leads to: Getting a PGCE without QTS means you will not be qualified to teach in most primary, secondary and special schools in England, although some schools will employ teachers without QTS. -If you get a PGCE without QTS you will also not be entitled to the same benefits during your training and career as QTS with PGCE. For example, better pay and support when you start teaching. +If you get a PGCE without QTS you will not be entitled to the same benefits during your training and career as QTS with PGCE. For example, better pay and support when you start teaching. ## Benefits of having QTS with PGCE @@ -73,13 +75,13 @@ You may want to do a master’s in education, for example, for your professional ## Types of PGCE courses -You can get QTS with a PGCE in primary or secondary education. Your course will involve both school placements and academic theory. +You can get QTS with a PGCE in primary education or secondary education. Your course will involve both school placements and academic theory. You can do this through a school-led, university-led, or an apprenticeship teacher training programme. You can do a full or part-time PGCE course. -As part of selecting your course, you will need to decide if you want to train to teach at a primary or secondary level. [Learn about the different age groups you could teach](/life-as-a-teacher/age-groups-and-specialisms/age-groups-you-could-teach). +As part of selecting your course, you'll need to decide if you want to train to teach at a primary or secondary level. [Learn about the different age groups you could teach](/life-as-a-teacher/age-groups-and-specialisms/age-groups-you-could-teach). You can also do a PGCE without QTS in [further education](/life-as-a-teacher/age-groups-and-specialisms/further-education-teachers). @@ -101,4 +103,6 @@ A PGDE in England is very similar to a PGCE, the difference being the number of PGCE courses can contain up to 60 credits at master’s degree level, and PGDE courses can contain up to 120. This usually means that doing a PGDE will include more assignments. +As with PGCEs, you can do a PGDE in primary education or secondary education. + More teacher training providers offer a PGCE than a PGDE. diff --git a/app/views/content/train-to-be-a-teacher/what-is-qts.md b/app/views/content/train-to-be-a-teacher/what-is-qts.md index f6d1e4d699..8d9f4fef62 100644 --- a/app/views/content/train-to-be-a-teacher/what-is-qts.md +++ b/app/views/content/train-to-be-a-teacher/what-is-qts.md @@ -68,7 +68,7 @@ If your teacher training course leads to QTS: As a teacher with QTS: * you'll receive a package of [support for early career teachers](/life-as-a-teacher/teaching-as-a-career/early-career-teachers), including a reduced timetable -* you'll be on the qualified teacher pay range and receive a higher salary than teachers without QTS +* you'll be on the qualified teacher pay range and [receive a higher salary than teachers without QTS](/life-as-a-teacher/pay-and-benefits/teacher-pay) You can also get other academic awards through teacher training such as a postgraduate certificate in education (PGCE) or Bachelor of Education (BEd). diff --git a/app/views/event_steps/_personalised_updates.html.erb b/app/views/event_steps/_personalised_updates.html.erb index be534895fd..0d9452adb6 100644 --- a/app/views/event_steps/_personalised_updates.html.erb +++ b/app/views/event_steps/_personalised_updates.html.erb @@ -29,8 +29,7 @@
We run in-person events in the UK that we can tell you about if you give us your UK postcode.
-If you do not live in the UK, you do not need to give us your postcode.
-Instead, you can just select 'Complete sign up' to finish signing up for your event.
+We run in-person events in the UK. We can tell you about these if you give us your UK postcode.
+If you do not live in the UK, you do not need to give us your postcode. Instead, you can just select 'Complete sign up' to finish signing up for your event.
If you give us your postcode, we'll let you know about events happening near you.
+We'll only use this to send you information about events happening near you.
<% end %>We run in-person events in the UK that we can tell you about if you give us your UK postcode.
-If you do not live in the UK, you do not need to give us your postcode.
-Instead, you can just select 'Complete sign up' to receive tailored guidance around teacher training.
+We run in-person events in the UK. We can tell you about these if you give us your UK postcode.
+If you do not live in the UK, you do not need to give us your postcode. Instead, you can just select 'Complete sign up' to receive tailored guidance about teacher training.
- Select a secondary school subject or select 'primary' even if you're not sure yet. You can change your preferences later. -
+Select a secondary school subject or select primary.
<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 5019cd49be..ed690ecd3c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -563,7 +563,7 @@ en: consideration_journey_stage_id: inclusion: Select how close you are to applying for teacher training preferred_teaching_subject_id: - inclusion: Select the subject you want to teach + inclusion: Select the subject you're most interested in teaching callbacks/steps/personal_details: attributes: @@ -785,10 +785,10 @@ en: events_steps_contact_details: address_telephone: What is your telephone number? (optional) events_steps_personalised_updates: - address_postcode: What is your UK postcode? (optional) + address_postcode: What's your UK postcode? (optional) degree_status_id: Do you have a degree? consideration_journey_stage_id: How close are you to applying for teacher training? - preferred_teaching_subject_id: What do you want to teach? + preferred_teaching_subject_id: Select the subject you're most interested in teaching callbacks_steps_personal_details: first_name: First name @@ -809,9 +809,9 @@ en: mailing_list_steps_teacher_training: consideration_journey_stage_id: How close are you to applying for teacher training? mailing_list_steps_subject: - preferred_teaching_subject_id: Which subject do you want to teach? + preferred_teaching_subject_id: Select the subject you're most interested in teaching mailing_list_steps_postcode: - address_postcode: Your UK postcode (optional) + address_postcode: What's your UK postcode? (optional) search: search: Search for ... @@ -826,10 +826,10 @@ en: resent: We've sent you another email events_steps_personalised_updates: address_postcode: |- - If you give us your postcode, we'll let you know about events happening near you. + We'll only use this to send you information about events happening near you. mailing_list_signup: address_postcode: |- - If you give us your postcode, we'll let you know about events happening near you. + We'll only use this to send you information about events happening near you. teacher_training_adviser_steps_what_subject_degree: degree_subject: "Type to enter your degree subject or select from the suggestions." degree_subject_nojs: "Type to enter your degree subject." diff --git a/docs/sign-up-journeys.md b/docs/sign-up-journeys.md index 5ac22181e4..527910ab0f 100644 --- a/docs/sign-up-journeys.md +++ b/docs/sign-up-journeys.md @@ -16,9 +16,9 @@ graph TD; authenticate -- On mailing list --> signed_up_already[You've already signed up] degree_status --> teacher_training[How close are you to applying?] - teacher_training --> subject[Which subject do you want to teach?] + teacher_training --> subject[Select the subject you're most interested in teaching] - subject --> postcode["Your UK postcode (optional)"] + subject --> postcode["What's your UK postcode? (optional)"] postcode --> show_welcome_guide{Show welcome guide?} diff --git a/spec/features/event_wizard_spec.rb b/spec/features/event_wizard_spec.rb index 39e6e3480b..92ff37ca16 100644 --- a/spec/features/event_wizard_spec.rb +++ b/spec/features/event_wizard_spec.rb @@ -173,7 +173,7 @@ end click_on "Complete sign up" - expect(page).not_to have_text("What is your UK postcode? (optional)") + expect(page).not_to have_text("What's your UK postcode? (optional)") fill_in_personalised_updates expect_sign_up_with_attributes( @@ -304,10 +304,10 @@ def fill_in_personalised_updates( ) select_value_or_default "Do you have a degree?", degree_status select_value_or_default "How close are you to applying for teacher training?", consideration_journey_stage - if page.has_text?("What is your UK postcode? (optional)") - fill_in "What is your UK postcode? (optional)", with: postcode + if page.has_text?("What's your UK postcode? (optional)") + fill_in "What's your UK postcode? (optional)", with: postcode end - select_value_or_default "What do you want to teach?", preferred_teaching_subject + select_value_or_default "Select the subject you're most interested in teaching", preferred_teaching_subject end def select_value_or_default(label, value = nil) diff --git a/spec/features/mailing_list_wizard_spec.rb b/spec/features/mailing_list_wizard_spec.rb index e3a421ac91..88fcd1fef5 100644 --- a/spec/features/mailing_list_wizard_spec.rb +++ b/spec/features/mailing_list_wizard_spec.rb @@ -32,12 +32,12 @@ choose "I'm not sure and finding out more" click_on "Next step" - expect(page).to have_text "Which subject do you want to teach" + expect(page).to have_text "Select the subject you're most interested in teaching" select "Maths" click_on "Next step" - expect(page).to have_text "If you give us your postcode" - fill_in "Your UK postcode (optional)", with: "TE57 1NG" + expect(page).to have_text "We'll only use this to send you information about events happening near you" + fill_in "What's your UK postcode? (optional)", with: "TE57 1NG" click_on "Complete sign up" expect(page).to have_title("You've signed up | Get Into Teaching") @@ -73,12 +73,12 @@ choose "I'm not sure and finding out more" click_on "Next step" - expect(page).to have_text "Which subject do you want to teach" + expect(page).to have_text "Select the subject you're most interested in teaching" select "Maths" click_on "Next step" - expect(page).to have_text "If you give us your postcode" - fill_in "Your UK postcode (optional)", with: "TE57 1NG" + expect(page).to have_text "We'll only use this to send you information about events happening near you" + fill_in "What's your UK postcode? (optional)", with: "TE57 1NG" click_on "Complete sign up" expect(page).to have_text "Test, you're signed up" @@ -112,12 +112,12 @@ choose "I'm not sure and finding out more" click_on "Next step" - expect(page).to have_text "Which subject do you want to teach" + expect(page).to have_text "Select the subject you're most interested in teaching" select "Maths" click_on "Next step" - expect(page).to have_text "If you give us your postcode" - fill_in "Your UK postcode (optional)", with: "TE57 1NG" + expect(page).to have_text "We'll only use this to send you information about events happening near you" + fill_in "What's your UK postcode? (optional)", with: "TE57 1NG" click_on "Complete sign up" expect(page).to have_text "Test, you're signed up" @@ -151,12 +151,12 @@ choose "I'm not sure and finding out more" click_on "Next step" - expect(page).to have_text "Which subject do you want to teach" + expect(page).to have_text "Select the subject you're most interested in teaching" select "Maths" click_on "Next step" - expect(page).to have_text "If you give us your postcode" - fill_in "Your UK postcode (optional)", with: "TE57 1NG" + expect(page).to have_text "We'll only use this to send you information about events happening near you" + fill_in "What's your UK postcode? (optional)", with: "TE57 1NG" click_on "Complete sign up" expect(page).to have_text "Test, you're signed up" @@ -203,9 +203,9 @@ ) click_on "Next step" - expect(page).to have_text "Which subject do you want to teach" + expect(page).to have_text "Select the subject you're most interested in teaching" expect(page).to have_select( - "Which subject do you want to teach?", + "Select the subject you're most interested in teaching", selected: Crm::TeachingSubject.lookup_by_uuid(response.preferred_teaching_subject_id), ) click_on "Complete sign up" @@ -341,12 +341,12 @@ ) click_on "Next step" - expect(page).to have_text "Which subject do you want to teach" + expect(page).to have_text "Select the subject you're most interested in teaching" select "Maths" click_on "Next step" - expect(page).to have_text "If you give us your postcode" - fill_in "Your UK postcode (optional)", with: "" + expect(page).to have_text "We'll only use this to send you information about events happening near you" + fill_in "What's your UK postcode? (optional)", with: "" click_on "Complete sign up" expect(page).to have_text "you're signed up" diff --git a/spec/integration/mailing_list_spec.rb b/spec/integration/mailing_list_spec.rb index 6f02aa9c6d..1e2d08b385 100644 --- a/spec/integration/mailing_list_spec.rb +++ b/spec/integration/mailing_list_spec.rb @@ -51,12 +51,12 @@ def sign_up(first_name, last_name, email) click_label "I’m not sure and finding out more" click_on "Next step" - expect(page).to have_text "Which subject do you want to teach?" + expect(page).to have_text "Select the subject you're most interested in teaching" select "Chemistry" click_on "Next step" - expect(page).to have_text "If you give us your postcode" - fill_in "Your UK postcode (optional)", with: "TE57 1NG" + expect(page).to have_text "We'll only use this to send you information about events happening near you" + fill_in "What's your UK postcode? (optional)", with: "TE57 1NG" click_on "Complete sign up" expect(page).to have_text("you're signed up") @@ -84,12 +84,12 @@ def sign_up_if_not_qualified(first_name, last_name, email) click_label "I’m not sure and finding out more" click_on "Next step" - expect(page).to have_text("Which subject do you want to teach") + expect(page).to have_text("Select the subject you're most interested in teaching") select "Maths" click_on "Next step" - expect(page).to have_text "If you give us your postcode" - fill_in "Your UK postcode (optional)", with: "TE57 1NG" + expect(page).to have_text "We'll only use this to send you information about events happening near you" + fill_in "What's your UK postcode? (optional)", with: "TE57 1NG" click_on "Complete sign up" expect(page).to have_text("you're signed up") diff --git a/spec/views/content/shared/benefits.html.erb_spec.rb b/spec/views/content/shared/benefits.html.erb_spec.rb index 4effc02723..f217720fc4 100644 --- a/spec/views/content/shared/benefits.html.erb_spec.rb +++ b/spec/views/content/shared/benefits.html.erb_spec.rb @@ -13,7 +13,7 @@ it { is_expected.to have_css("ul li") } it { is_expected.to have_link("competitive salary starting at", href: "/life-as-a-teacher/pay-and-benefits/teacher-pay") } - it { is_expected.to have_link("generous and secure pension", href: "/life-as-a-teacher/pay-and-benefits/teachers-pension-scheme") } + it { is_expected.to have_link("secure pension", href: "/life-as-a-teacher/pay-and-benefits/teachers-pension-scheme") } it { is_expected.to have_text(subject_name) } it { is_expected.to have_text(salary_value) } end diff --git a/yarn.lock b/yarn.lock index 355decef79..da366b1314 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1643,11 +1643,6 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.24" -"@jridgewell/resolve-uri@3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" - integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== - "@jridgewell/resolve-uri@^3.1.0": version "3.1.2" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" @@ -1671,7 +1666,7 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": +"@jridgewell/sourcemap-codec@^1.4.10": version "1.4.14" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== @@ -1681,15 +1676,7 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== -"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.17" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" - integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== - dependencies: - "@jridgewell/resolve-uri" "3.1.0" - "@jridgewell/sourcemap-codec" "1.4.14" - -"@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": +"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.9": version "0.3.25" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== @@ -1697,14 +1684,6 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@jridgewell/trace-mapping@^0.3.20": - version "0.3.24" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.24.tgz#e5640be1cab4085e4012a94c132ae86138f90f48" - integrity sha512-+VaWXDa6+l6MhflBvVXjIEAzb59nQ2JUK3bwRp2zRpPtU+8TFRy9Gg/5oIcNlkEL5PGlBFGfemUVvIgLnTzq7Q== - dependencies: - "@jridgewell/resolve-uri" "^3.1.0" - "@jridgewell/sourcemap-codec" "^1.4.14" - "@leichtgewicht/ip-codec@^2.0.1": version "2.0.4" resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" @@ -6636,7 +6615,7 @@ saxes@^6.0.0: dependencies: xmlchars "^2.2.0" -schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0, schema-utils@^3.3.0: +schema-utils@^3.0.0, schema-utils@^3.2.0, schema-utils@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== @@ -6645,10 +6624,10 @@ schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0, schema-utils@^3.3 ajv "^6.12.5" ajv-keywords "^3.5.2" -schema-utils@^4.0.0, schema-utils@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b" - integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw== +schema-utils@^4.0.0, schema-utils@^4.2.0, schema-utils@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.3.0.tgz#3b669f04f71ff2dfb5aba7ce2d5a9d79b35622c0" + integrity sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g== dependencies: "@types/json-schema" "^7.0.9" ajv "^8.9.0" @@ -6696,7 +6675,7 @@ send@0.19.0: range-parser "~1.2.1" statuses "2.0.1" -serialize-javascript@^6.0.1, serialize-javascript@^6.0.2: +serialize-javascript@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g== @@ -7204,20 +7183,20 @@ tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1: integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== terser-webpack-plugin@5, terser-webpack-plugin@^5.3.10: - version "5.3.10" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199" - integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w== + version "5.3.11" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz#93c21f44ca86634257cac176f884f942b7ba3832" + integrity sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ== dependencies: - "@jridgewell/trace-mapping" "^0.3.20" + "@jridgewell/trace-mapping" "^0.3.25" jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.1" - terser "^5.26.0" - -terser@^5.26.0: - version "5.28.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.28.1.tgz#bf00f7537fd3a798c352c2d67d67d65c915d1b28" - integrity sha512-wM+bZp54v/E9eRRGXb5ZFDvinrJIOaTapx3WUokyVGZu5ucVCK55zEgGd5Dl2fSr3jUo5sDiERErUWLY6QPFyA== + schema-utils "^4.3.0" + serialize-javascript "^6.0.2" + terser "^5.31.1" + +terser@^5.31.1: + version "5.37.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.37.0.tgz#38aa66d1cfc43d0638fab54e43ff8a4f72a21ba3" + integrity sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2"