Update English task name when form is live

Author: DavidBiddle

app/controllers/forms/make_language_live_controller.rb

@@ -56,7 +56,7 @@ def make_language_live_input_params
     end
 
     def render_new(status: :ok)
-      render "new", status:, locals: { current_form:, language: params[:language] }
+      render "new", status:, locals: { current_form:, language: params[:language], page_title: new_page_title, page_body: new_page_body }
     end
 
     def render_confirmation(status: :ok)
@@ -73,5 +73,21 @@ def render_confirmation(status: :ok)
     def go_to_make_welsh_live_input_params
       params.require(:forms_go_to_make_welsh_live_input).permit(:confirm)
     end
+
+    def new_page_title
+      return I18n.t("page_titles.make_your_changes_to_english_live") if making_english_changes_live?
+
+      I18n.t("page_titles.make_language_live.#{params[:language]}")
+    end
+
+    def new_page_body
+      return t("make_language_live.en.make_your_changes_to_english_live.body_html", submission_email: @current_form.submission_email) if making_english_changes_live?
+
+      t("make_language_live.#{params[:language]}.new.body_html", submission_email: @current_form.submission_email)
+    end
+
+    def making_english_changes_live?
+      @current_form.is_live? && params[:language] == "en"
+    end
   end
 end

app/services/form_task_list_service.rb

@@ -226,7 +226,7 @@ def make_only_english_live_task
     can_make_form_live = status == :not_started
 
     {
-      task_name: I18n.t("forms.task_list_create.make_form_live_section.make_english_form_live"),
+      task_name: @form.is_live? ? I18n.t("forms.task_list_edit.make_form_live_section.make_english_form_live") : I18n.t("forms.task_list_create.make_form_live_section.make_english_form_live"),
       path: can_make_form_live ? make_language_live_path(@form.id, language: "en") : "",
       status:,
       active: can_make_form_live,

app/views/forms/make_language_live/new.html.erb

@@ -1,4 +1,4 @@
-<% set_page_title(title_with_error_prefix(t("page_titles.make_language_live.#{language}"), @make_language_live_input.errors.any?)) %>
+<% set_page_title(title_with_error_prefix((page_title), @make_language_live_input.errors.any?)) %>
 <% content_for :back_link, govuk_back_link_to(form_path, t("back_link.form_create")) %>
 
 <div class="govuk-grid-row">
@@ -10,10 +10,10 @@
 
       <h1 class="govuk-heading-l">
         <span class="govuk-caption-l"><%= @make_language_live_input.form.name %></span>
-        <%= t("page_titles.make_language_live.#{language}") %>
+        <%= page_title %>
       </h1>
 
-      <%= t("make_language_live.#{language}.new.body_html", submission_email: @make_language_live_input.form.submission_email) %>
+      <%= page_body %>
 
       <%= f.govuk_collection_radio_buttons :confirm,
                                            @make_language_live_input.values, ->(option) { option }, ->(option) { t("helpers.label.confirm_action_input.options.#{option}") },

config/locales/en.yml

@@ -582,6 +582,7 @@ en:
           submission_attachments: Get a CSV or JSON file of each completed form
         title: Change how you get completed forms
       make_form_live_section:
+        make_english_form_live: Make changes to your English form live
         make_live: Make your changes live
         share_preview: Share a preview of your draft form
         title: Make your changes live
@@ -1229,6 +1230,10 @@ en:
           <p>The form will not be indexed by search engines, so people will not be able to find it easily. Contact your GOV.UK publishing team to publish links to your form on GOV.UK so people can find it.</p>
           <p>Completed forms will be sent to: <span class="govuk-!-text-break-word">%{submission_email}</span></p>
     en:
+      make_your_changes_to_english_live:
+        body_html: |
+          <p>The form will not be indexed by search engines, so people will not be able to find it easily. Contact your GOV.UK publishing team to publish links to your form on GOV.UK so people can find it.</p>
+          <p>Completed forms will be sent to: <span class="govuk-!-text-break-word">%{submission_email}</span></p>
       new:
         body_html: |
           <p>When you make your form live you’ll get a new URL for the English version.</p>

spec/requests/forms/make_language_live_controller_spec.rb

@@ -24,14 +24,19 @@
       get make_language_live_path(form_id: form.id, language:)
       expect(response).to render_template("make_language_live/new")
       expect(response).to have_http_status(:ok)
+      expect(response.body).to include(I18n.t("page_titles.make_language_live.en"))
+      expect(response.body).to include(I18n.t("make_language_live.en.new.body_html", submission_email: form.submission_email))
     end
 
     context "when editing a draft of an existing live form" do
-      let(:form) { create(:form, :live) }
+      let(:form) { create(:form, :live_with_draft) }
 
-      it "redirects to the form task list" do
+      it "renders make your form live" do
         get make_language_live_path(form_id: form.id, language:)
-        expect(response).to redirect_to(form_path(form_id: form.id))
+        expect(response).to render_template("make_language_live/new")
+        expect(response).to have_http_status(:ok)
+        expect(response.body).to include(I18n.t("page_titles.make_your_changes_to_english_live"))
+        expect(response.body).to include(I18n.t("make_language_live.en.make_your_changes_to_english_live.body_html", submission_email: form.submission_email))
       end
     end
 

spec/services/form_task_list_service_spec.rb

@@ -510,7 +510,7 @@
                 end
 
                 it "has a link to make the English form live" do
-                  expect(section_rows.second[:task_name]).to eq I18n.t("forms.task_list_create.make_form_live_section.make_english_form_live")
+                  expect(section_rows.second[:task_name]).to eq I18n.t("forms.task_list_edit.make_form_live_section.make_english_form_live")
                   expect(section_rows.second[:path]).to eq "/forms/#{form.id}/make-live/en"
                   expect(section_rows.second[:status]).to eq :not_started
                 end

spec/views/forms/make_language_live/new.html.erb_spec.rb

@@ -15,22 +15,24 @@
 
   context "when there are no errors" do
     before do
-      render template: "forms/make_language_live/new", locals: { current_form:, language: }
+      render template: "forms/make_language_live/new", locals: { current_form:, language:, page_title:, page_body: }
     end
 
     context "when the language being made live is English" do
       let(:language) { "en" }
+      let(:page_title) { t("page_titles.make_language_live.en") }
+      let(:page_body) { t("make_language_live.en.new.body_html", submission_email: current_form.submission_email) }
 
       it "has the correct page title" do
-        expect(view.content_for(:title)).to eq t("page_titles.make_language_live.en")
+        expect(view.content_for(:title)).to eq page_title
       end
 
       it "contains a heading" do
-        expect(rendered).to have_css("h1", text: t("page_titles.make_language_live.en"))
+        expect(rendered).to have_css("h1", text: page_title)
       end
 
       it "contains the body text" do
-        expect(rendered).to include(t("make_language_live.en.new.body_html", submission_email: current_form.submission_email))
+        expect(rendered).to include page_body
       end
 
       it "renders radio buttons for making the draft changes live" do
@@ -46,17 +48,19 @@
 
     context "when the language being made live is Welsh" do
       let(:language) { "cy" }
+      let(:page_title) { t("page_titles.make_language_live.cy") }
+      let(:page_body) { t("make_language_live.cy.new.body_html", submission_email: current_form.submission_email) }
 
       it "has the correct page title" do
-        expect(view.content_for(:title)).to eq t("page_titles.make_language_live.cy")
+        expect(view.content_for(:title)).to eq page_title
       end
 
       it "contains a heading" do
-        expect(rendered).to have_css("h1", text: t("page_titles.make_language_live.cy"))
+        expect(rendered).to have_css("h1", text: page_title)
       end
 
       it "contains the body text" do
-        expect(rendered).to include(t("make_language_live.cy.new.body_html", submission_email: current_form.submission_email))
+        expect(rendered).to include page_body
       end
 
       it "renders radio buttons for making the draft changes live" do
@@ -76,11 +80,13 @@
       make_language_live_input.errors.add(:confirm, "An error")
 
       assign(:make_language_live_input, make_language_live_input)
-      render template: "forms/make_language_live/new", locals: { current_form:, language: }
+      render template: "forms/make_language_live/new", locals: { current_form:, language:, page_title:, page_body: }
     end
 
     context "when the language being made live is English" do
       let(:language) { "en" }
+      let(:page_title) { t("page_titles.make_language_live.en") }
+      let(:page_body) { t("make_language_live.en.new.body_html", submission_email: current_form.submission_email) }
 
       it "displays the error summary" do
         expect(rendered).to have_selector(".govuk-error-summary")
@@ -91,12 +97,14 @@
       end
 
       it "sets the page title with error prefix" do
-        expect(view.content_for(:title)).to eq(title_with_error_prefix(t("page_titles.make_language_live.en"), true))
+        expect(view.content_for(:title)).to eq(title_with_error_prefix(page_title, true))
       end
     end
 
     context "when the language being made live is Welsh" do
       let(:language) { "cy" }
+      let(:page_title) { t("page_titles.make_language_live.cy") }
+      let(:page_body) { t("make_language_live.cy.new.body_html", submission_email: current_form.submission_email) }
 
       it "displays the error summary" do
         expect(rendered).to have_selector(".govuk-error-summary")
@@ -107,7 +115,7 @@
       end
 
       it "sets the page title with error prefix" do
-        expect(view.content_for(:title)).to eq(title_with_error_prefix(t("page_titles.make_language_live.cy"), true))
+        expect(view.content_for(:title)).to eq(title_with_error_prefix(page_title, true))
       end
     end
   end