From 3dd15cda618d25856ac8f0d3a22a0b5db557772e Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 8 Mar 2022 11:50:30 +0000 Subject: [PATCH] Remove some of the previous soft validations set up --- app/models/form/page.rb | 9 ++------- .../form/_validation_override_question.html.erb | 15 --------------- app/views/form/page.html.erb | 4 ---- config/routes.rb | 1 - spec/fixtures/complete_case_log.json | 4 ++-- spec/fixtures/forms/2021_2022.json | 2 +- spec/helpers/check_answers_helper_spec.rb | 3 ++- spec/models/form/page_spec.rb | 9 --------- 8 files changed, 7 insertions(+), 40 deletions(-) delete mode 100644 app/views/form/_validation_override_question.html.erb diff --git a/app/models/form/page.rb b/app/models/form/page.rb index 6542a6ff6..f572a14fc 100644 --- a/app/models/form/page.rb +++ b/app/models/form/page.rb @@ -1,5 +1,5 @@ class Form::Page - attr_accessor :id, :header, :description, :questions, :soft_validations, + attr_accessor :id, :header, :description, :questions, :depends_on, :title_text, :informative_text, :subsection, :hide_subsection_label def initialize(id, hsh, subsection) @@ -11,16 +11,11 @@ class Form::Page @title_text = hsh["title_text"] @informative_text = hsh["informative_text"] @hide_subsection_label = hsh["hide_subsection_label"] - @soft_validations = hsh["soft_validations"]&.map { |sv_id, s| Form::Question.new(sv_id, s, self) } @subsection = subsection end def expected_responses - questions + (soft_validations || []) - end - - def has_soft_validations? - soft_validations.present? + questions end def routed_to?(case_log) diff --git a/app/views/form/_validation_override_question.html.erb b/app/views/form/_validation_override_question.html.erb deleted file mode 100644 index 73f513b6b..000000000 --- a/app/views/form/_validation_override_question.html.erb +++ /dev/null @@ -1,15 +0,0 @@ - diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb index 48a005aaf..eb955af05 100644 --- a/app/views/form/page.html.erb +++ b/app/views/form/page.html.erb @@ -46,10 +46,6 @@ <% end %> - <% if @page.has_soft_validations? %> - <%= render partial: "form/validation_override_question", locals: { f: f, page: @page } %> - <% end %> - <%= f.hidden_field :page, value: @page.id %> <% if @case_log.form.is_last_question?(@page, @subsection, @case_log) %> <%= f.govuk_submit "Submit lettings log", accesskey: "s" %> diff --git a/config/routes.rb b/config/routes.rb index c230a969c..2b6b4aa7d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -60,7 +60,6 @@ Rails.application.routes.draw do FormHandler.instance.forms.each do |_key, form| form.pages.map do |page| get page.id.to_s.dasherize, to: "form##{page.id}" - get "#{page.id.to_s.dasherize}/soft-validations", to: "soft_validations#show" if page.has_soft_validations? end form.subsections.map do |subsection| diff --git a/spec/fixtures/complete_case_log.json b/spec/fixtures/complete_case_log.json index 57a38125c..6f3bf98e9 100644 --- a/spec/fixtures/complete_case_log.json +++ b/spec/fixtures/complete_case_log.json @@ -118,7 +118,7 @@ "rp_hardship": 0, "rp_dontknow": 0, "discarded_at": "05/05/2020", - "net_income_value_check": "", + "net_income_value_check": 0, "property_owner_organisation": "", "property_manager_organisation": "", "rent_type": 0, @@ -141,7 +141,7 @@ "has_benefits": 1, "household_charge": 1, "is_carehome": 1, - "chcharge": 6, + "chcharge": 6, "letting_in_sheltered_accommodation": 0, "declaration": 1, "referral": 1 diff --git a/spec/fixtures/forms/2021_2022.json b/spec/fixtures/forms/2021_2022.json index 3720eaa92..188f6fdd9 100644 --- a/spec/fixtures/forms/2021_2022.json +++ b/spec/fixtures/forms/2021_2022.json @@ -70,7 +70,7 @@ "questions": { "ecstat1": { "check_answer_label": "Lead tenant’s working situation", - "header": "Which of these best describes the lead tenant’s working situation?", + "header": "Which of these best describes the lead tenant’s socks?", "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.", "type": "radio", "answer_options": { diff --git a/spec/helpers/check_answers_helper_spec.rb b/spec/helpers/check_answers_helper_spec.rb index 0d1a94d6d..ade2473c3 100644 --- a/spec/helpers/check_answers_helper_spec.rb +++ b/spec/helpers/check_answers_helper_spec.rb @@ -9,7 +9,7 @@ RSpec.describe CheckAnswersHelper do context "when a section hasn't been completed yet" do it "returns that you have unanswered questions" do expect(display_answered_questions_summary(subsection, case_log)) - .to match(/You have answered 2 of 5 questions./) + .to match(/You have answered 2 of 6 questions./) end end @@ -18,6 +18,7 @@ RSpec.describe CheckAnswersHelper do case_log.sex1 = "F" case_log.other_hhmemb = 0 case_log.propcode = "123" + case_log.ecstat1 = 200 expect(display_answered_questions_summary(subsection, case_log)) .to match(/You answered all the questions./) expect(display_answered_questions_summary(subsection, case_log)) diff --git a/spec/models/form/page_spec.rb b/spec/models/form/page_spec.rb index 19428ce6a..958c4fe26 100644 --- a/spec/models/form/page_spec.rb +++ b/spec/models/form/page_spec.rb @@ -31,15 +31,6 @@ RSpec.describe Form::Page, type: :model do expect(page.questions.map(&:id)).to eq(expected_questions) end - it "has soft validations" do - expected_soft_validations = %w[net_income_value_check] - expect(page.soft_validations.map(&:id)).to eq(expected_soft_validations) - end - - it "has a soft_validation helper" do - expect(page.has_soft_validations?).to be true - end - it "has expected form responses" do expected_responses = %w[earnings incfreq net_income_value_check] expect(page.expected_responses.map(&:id)).to eq(expected_responses)