Retain draft state when English version is made live

When we make the English version of a form live, we want the form state to be 'live_with_draft' rather than 'live' - this reflects the fact that the form still has changes to be made live.

Author: DavidBiddle

app/state_machines/form_state_machine.rb

@@ -37,7 +37,7 @@ module FormStateMachine
         before :before_make_english_live
         after :after_make_english_live
 
-        transitions from: %i[draft live live_with_draft archived_with_draft], to: :live, guard: :can_make_english_version_live?
+        transitions from: %i[draft live live_with_draft archived_with_draft], to: :live_with_draft, guard: :can_make_english_version_live?
       end
 
       event :make_welsh_version_live do

spec/requests/forms/make_language_live_controller_spec.rb

@@ -80,7 +80,7 @@
             expect {
               post(make_language_live_path(form_id: form.id, language:), params: form_params)
             }.to change { FormDocument.where(language:).count }.by(1)
-            .and change { form.reload.state }.to("live")
+            .and change { form.reload.state }.to("live_with_draft")
           end
 
           it "sets the English FormDocument's live_at time to be equal to the form's updated_at time" do
@@ -127,7 +127,7 @@
             expect {
               post(make_language_live_path(form_id: form.id, language:), params: form_params)
             }.to change { FormDocument.where(language:).count }.by(1)
-            .and change { form.reload.state }.to("live")
+            .and change { form.reload.state }.to("live_with_draft")
           end
         end
       end

spec/services/make_form_live_service_spec.rb

@@ -64,7 +64,7 @@
         it "makes the English form live" do
           expect {
             make_form_live_service.make_language_live
-          }.to change(current_form, :state).to("live")
+          }.to change(current_form, :state).to("live_with_draft")
           .and change(FormDocument.where(form: current_form, tag: "live", language: "en"), :count).by(1)
           .and not_change(FormDocument.where(form: current_form, tag: "live", language: "cy"), :count)
         end
@@ -80,7 +80,7 @@
       let(:language) { "cy" }
 
       context "when the form has a live English version" do
-        let(:current_form) { create :form, :ready_for_live, :with_welsh_translation}
+        let(:current_form) { create :form, :ready_for_live, :with_welsh_translation }
 
         before do
           current_form.make_english_version_live!

spec/state_machines/form_state_machine_spec.rb

@@ -118,7 +118,7 @@ def after_archive; end
       end
 
       it "transitions to live state" do
-        expect(form).to transition_from(form_state).to(:live).on_event(:make_english_version_live)
+        expect(form).to transition_from(form_state).to(:live_with_draft).on_event(:make_english_version_live)
       end
 
       it "calls the before_make_english_live callback" do