Merge pull request #2605 from alphagov/fix-copied-form-not-added-to-group

Fix copied form not added to group if it has no questions

Author: stephencdaly

app/services/form_copy_service.rb

@@ -23,12 +23,13 @@ def copy(tag: "draft")
 
       copy_pages(content["steps"])
       copy_routing_conditions(content["steps"])
-      copy_group
 
       @copied_form.copied_from_id = @form.id
       @copied_form.creator_id = @logged_in_user.id
       @copied_form.save!
 
+      copy_group
+
       # Copy Welsh translations if available
       if @form.available_languages.include?("cy")
         copy_welsh_translations(tag:)

spec/services/form_copy_service_spec.rb

@@ -5,7 +5,8 @@
   let(:source_form) { create(:form, :live_with_draft) }
   let(:source_form_document) { FormDocument.find_by(form_id: source_form.id) }
   let(:logged_in_user) { create(:user) }
-  let(:copied_form) { described_class.new(source_form, logged_in_user).copy(tag: "live") }
+  let(:tag) { "live" }
+  let(:copied_form) { described_class.new(source_form, logged_in_user).copy(tag:) }
 
   before do
     GroupForm.create!(form: source_form, group: group)
@@ -233,11 +234,24 @@
 
     context "when source form is in a group" do
       let(:group) { create(:group) }
-      let(:source_form) { create(:form, :live_with_draft) }
 
-      it "places the copied form in the same group as the original form" do
-        expect(copied_form.group).to eq(source_form.group)
-        expect(copied_form.group).to eq(group)
+      context "when copying a live form" do
+        let(:source_form) { create(:form, :live_with_draft) }
+
+        it "places the copied form in the same group as the original form" do
+          expect(copied_form.group).to eq(source_form.group)
+          expect(copied_form.group).to eq(group)
+        end
+      end
+
+      context "when copying a draft form with no pages" do
+        let(:source_form) { create(:form) }
+        let(:tag) { "draft" }
+
+        it "places the copied form in the same group as the original form" do
+          expect(copied_form.group).to eq(source_form.group)
+          expect(copied_form.group).to eq(group)
+        end
       end
     end