feat(service): update links

app/views/framework_request_submissions/_energy.html.erb

@@ -19,7 +19,7 @@
 </h1>
 
 <p class="govuk-body">
-  <%= I18n.t("faf_submissions.what_you_can_do_next.energy.list_start", guidance_link: link_to(I18n.t("faf_submissions.what_you_can_do_next.energy.guidance_link"), "https://www.gov.uk/guidance/buying-for-schools/energy", class: "govuk-link govuk-link--no-visited-state")).html_safe %>
+  <%= I18n.t("faf_submissions.what_you_can_do_next.energy.list_start", guidance_link: link_to(I18n.t("faf_submissions.what_you_can_do_next.energy.guidance_link"), "https://www.gov.uk/guidance/buying-for-schools-things-to-consider-before-you-start/energy", class: "govuk-link govuk-link--no-visited-state")).html_safe %>
   <ul class="govuk-list govuk-list--bullet">
     <% for bullet in I18n.t("faf_submissions.what_you_can_do_next.energy.bullets") %>
       <li><%= bullet %></li>

app/views/specify/support_request_submissions/show.html.erb

@@ -49,9 +49,7 @@
         </li>
         <li>
           <%=
-            I18n.t("support_request_submissions.you_can_also.step_two",
-              read_guides_link: link_to(I18n.t("support_request_submissions.you_can_also.read_guides_link"), "https://www.gov.uk/guidance/buying-for-schools", class: "govuk-link")
-            ).html_safe
+            link_to(I18n.t("support_request_submissions.you_can_also.read_guides_link"), "https://www.gov.uk/guidance/buying-for-schools-things-to-consider-before-you-start", class: "govuk-link").html_safe
           %>
         </li>
       </ul>

app/views/specify/support_requests/index.html.erb

@@ -28,13 +28,13 @@
         <a target="_blank" rel="noopener noreferrer" href="https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools/writing-a-specification" class="govuk-link">read about writing a specification</a>
       </li>
       <li>
-        find out more about <a target="_blank" rel="noopener noreferrer" href="https://www.gov.uk/guidance/buying-for-schools" class="govuk-link">planning for what you're buying</a>
+        <a target="_blank" rel="noopener noreferrer" href="https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools" class="govuk-link">read about how to buy what you need</a> to learn more about the buying process
       </li>
       <li>
-        read <a target="_blank" rel="noopener noreferrer" href="https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools" class="govuk-link">information on finding the right way to buy</a> for your school
+        <a target="_blank" rel="noopener noreferrer" href="https://www.gov.uk/guidance/buying-for-schools-things-to-consider-before-you-start" class="govuk-link">read guides about what to consider before buying specific goods and services</a>
       </li>
       <li>
-        use our <a target="_blank" rel="noopener noreferrer" href="https://www.gov.uk/guidance/find-a-dfe-approved-framework-for-your-school" class="govuk-link">find a framework service</a> to see if you can buy what you need using a DfE recommended framework
+        use our <a target="_blank" rel="noopener noreferrer" href="https://www.gov.uk/guidance/find-a-dfe-approved-framework-for-your-school" class="govuk-link">find a framework service</a> to see if you can buy what you need using a DfE approved framework
       </li>
     </ul>
 

config/locales/en.yml

@@ -436,8 +436,8 @@ en:
     energy_request:
       header: Is your request about energy?
       subtitle: About your request
-      body: 'You can read our guidance about %{guidance_link}. It includes:'
-      guidance_link: buying energy for your school
+      body: 'You can %{guidance_link}. It includes:'
+      guidance_link: read our guidance about buying energy for your school
       body_bullets:
         - whether you can get a reduced rate VAT
         - how to choose between fixed, flexible or variable price contracts
@@ -575,7 +575,7 @@ en:
       what_happens_next: What happens next
       what_you_can_do_next: What you can do next
     sub_header:
-      confirmation: 'We have sent a confirmation email to:'
+      confirmation: 'We have sent a confirmation email to'
     what_you_can_do_next:
       default:
         list_start: 'Read guidance about:'
@@ -1670,7 +1670,7 @@ en:
         We will not receive any new changes you make.
     intro:
     - Use this service to request free advice and support from our procurement experts for help with your catering or multi-functional devices specification.
-    - DfE's supported buying team will respond to you within 2 working days.
+    - The Get help buying for schools team will respond to you within 2 working days.
     label:
       category: What are you buying?
       message: How can we help?
@@ -1688,23 +1688,22 @@ en:
   support_request_submissions:
     back_button: Back to your dashboard
     body:
-      what_happens_next: The DfE's supported buying team will be in touch within %{days} working days to discuss how we can support you.
+      what_happens_next: The Get help buying for schools team will be in touch within %{days} working days to discuss how we can support you.
       what_you_can_do_next: "%{continue_link} if you can (but we won't receive these new changes), or %{start_new_link} if you haven't done so yet."
     header:
       confirmation: Your request for support has been sent
       what_happens_next: What happens next
       what_you_can_do_next: What you can do next
-      you_can_also: You can also
+      you_can_also: 'You can also:'
     sub_header:
-      confirmation: 'We have sent a confirmation to:'
+      confirmation: 'We have sent a confirmation to'
     what_you_can_do_next:
       continue_link: Continue with your specification
-      start_new_link: start a new specification
+      start_new_link: Start a new specification
     you_can_also:
-      read_guides_link: read guides about goods and services
-      read_procs_link: read buying procedures and procurement law for schools
+      read_guides_link: read guides about what to consider before buying specific goods and services
+      read_procs_link: read about how to buy what you need
       step_one: "%{read_procs_link} to learn more about the buying process"
-      step_two: "%{read_guides_link} that you're buying"
   task:
     button:
       back: Return to task list

spec/features/specify/support_requests/start_page_spec.rb

@@ -15,19 +15,19 @@
 
     it "explains the form to the user" do
       expect(find("div.govuk-grid-column-two-thirds", text: "Use this service to request free advice and support from our procurement experts for help with your catering or multi-functional devices specification.")).to be_present
-      expect(find("div.govuk-grid-column-two-thirds", text: "DfE's supported buying team will respond to you within 2 working days.")).to be_present
+      expect(find("div.govuk-grid-column-two-thirds", text: "The Get help buying for schools team will respond to you within 2 working days.")).to be_present
     end
 
     it "links to more information" do
       expect(page).to have_link "read about writing a specification",
                                 href: "https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools/writing-a-specification",
                                 class: "govuk-link"
 
-      expect(page).to have_link "planning for what you're buying",
-                                href: "https://www.gov.uk/guidance/buying-for-schools",
+      expect(page).to have_link "read guides about what to consider before buying specific goods and services",
+                                href: "https://www.gov.uk/guidance/buying-for-schools-things-to-consider-before-you-start",
                                 class: "govuk-link"
 
-      expect(page).to have_link "information on finding the right way to buy",
+      expect(page).to have_link "read about how to buy what you need",
                                 href: "https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools",
                                 class: "govuk-link"
 

spec/features/specify/support_requests/submit_support_request_spec.rb

@@ -89,17 +89,17 @@
       # support_request_submissions.confirmation.header
       expect(find("h1.govuk-panel__title")).to have_text "Your request for support has been sent"
       # support_request_submissions.sub_header.confirmation
-      expect(find("div.govuk-panel__body")).to have_text "We have sent a confirmation to: test@test"
+      expect(find("div.govuk-panel__body")).to have_text "We have sent a confirmation to test@test"
     end
 
     it "links to the dashboard" do
-      expect(page).to have_link "start a new specification", href: "/dashboard"
+      expect(page).to have_link "Start a new specification", href: "/dashboard"
     end
 
     it "links to further information" do
       within "ul.govuk-list--bullet" do
-        expect(page).to have_link "read buying procedures and procurement law for schools", href: "https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools"
-        expect(page).to have_link "read guides about goods and services", href: "https://www.gov.uk/guidance/buying-for-schools"
+        expect(page).to have_link "read about how to buy what you need", href: "https://www.gov.uk/guidance/buying-procedures-and-procurement-law-for-schools"
+        expect(page).to have_link "read guides about what to consider before buying specific goods and services", href: "https://www.gov.uk/guidance/buying-for-schools-things-to-consider-before-you-start"
       end
     end