Merge pull request #382 from alphagov/whn-markdown-cheanup

Remove what_happens_next_text column
alphagov · Dec 6, 2023 · 5e9bb46 · 5e9bb46
2 parents bd8b8d6 + 0c4d872
commit 5e9bb46
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 128 deletions.
diff --git a/app/service/task_status_service.rb b/app/service/task_status_service.rb
@@ -53,7 +53,7 @@ def declaration_status
   end
 
   def what_happens_next_status
-    if @form.what_happens_next_text.present? || @form.what_happens_next_markdown.present?
+    if @form.what_happens_next_markdown.present?
       :completed
     else
       :not_started

diff --git a/db/migrate/20231206162240_remove_what_happens_next_text_from_forms.rb b/db/migrate/20231206162240_remove_what_happens_next_text_from_forms.rb
@@ -0,0 +1,5 @@
+class RemoveWhatHappensNextTextFromForms < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :forms, :what_happens_next_text, :text
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -82,6 +82,6 @@
   submission_email:,
   support_email: "[email protected]",
   support_phone: "08000800",
-  what_happens_next_text: "Test",
+  what_happens_next_markdown: "Test",
 )
 all_question_types_form.make_live!
diff --git a/lib/tasks/what_happens_next_markdown.rake b/lib/tasks/what_happens_next_markdown.rake
diff --git a/spec/factories/forms.rb b/spec/factories/forms.rb
@@ -9,7 +9,7 @@
     support_phone { nil }
     support_url { nil }
     support_url_text { nil }
-    what_happens_next_text { nil }
+    what_happens_next_markdown { nil }
     declaration_text { nil }
     question_section_completed { false }
     declaration_section_completed { false }
@@ -44,7 +44,7 @@
     trait :ready_for_live do
       with_pages
       support_email { Faker::Internet.email(domain: "example.gov.uk") }
-      what_happens_next_text { "We usually respond to applications within 10 working days." }
+      what_happens_next_markdown { "We usually respond to applications within 10 working days." }
       question_section_completed { true }
       declaration_section_completed { true }
     end

diff --git a/spec/lib/tasks/what_happens_next_markdown_spec.rb b/spec/lib/tasks/what_happens_next_markdown_spec.rb
diff --git a/spec/models/form_spec.rb b/spec/models/form_spec.rb
@@ -251,7 +251,6 @@
         "privacy_policy_url",
         "form_slug",
         "start_page",
-        "what_happens_next_text",
         "support_email",
         "support_phone",
         "support_url",
@@ -309,7 +308,7 @@
           attribute_value: [],
         },
         {
-          attribute: :what_happens_next_text,
+          attribute: :what_happens_next_markdown,
           attribute_value: nil,
         },
         {

diff --git a/spec/request/api/v1/forms_controller_spec.rb b/spec/request/api/v1/forms_controller_spec.rb
@@ -194,7 +194,6 @@
         privacy_policy_url: nil,
         form_slug: "test-form-1",
         start_page: nil,
-        what_happens_next_text: nil,
         what_happens_next_markdown: nil,
         support_email: nil,
         support_phone: nil,

diff --git a/spec/service/task_status_service_spec.rb b/spec/service/task_status_service_spec.rb
@@ -85,14 +85,6 @@
         end
       end
 
-      context "with a form which has a what_happens_next_text" do
-        let(:form) { build(:form, :new_form, what_happens_next_text: "We usually respond to applications within 10 working days.") }
-
-        it "returns the completed status" do
-          expect(task_status_service.task_statuses[:what_happens_next_status]).to eq :completed
-        end
-      end
-
       context "with a form which has a what_happens_next_markdown" do
         let(:form) { build(:form, :new_form, what_happens_next_markdown: "We usually respond to applications within 10 working days.") }