From 0b1202b7ad8a72f052920716dfd87c939a9cff8d Mon Sep 17 00:00:00 2001 From: Kat Date: Fri, 19 May 2023 15:09:29 +0100 Subject: [PATCH] Extract town question to a separate row in CYA --- app/models/form/lettings/questions/address_line1.rb | 1 - app/models/form/lettings/questions/town_or_city.rb | 4 ---- app/models/form/sales/questions/address_line1.rb | 1 - app/models/form/sales/questions/town_or_city.rb | 4 ---- spec/models/form/lettings/questions/town_or_city_spec.rb | 4 ---- spec/models/form/sales/questions/town_or_city_spec.rb | 4 ---- 6 files changed, 18 deletions(-) diff --git a/app/models/form/lettings/questions/address_line1.rb b/app/models/form/lettings/questions/address_line1.rb index ef197e4fd..3e24583c4 100644 --- a/app/models/form/lettings/questions/address_line1.rb +++ b/app/models/form/lettings/questions/address_line1.rb @@ -15,7 +15,6 @@ class Form::Lettings::Questions::AddressLine1 < ::Form::Question log.address_line1, log.address_line2, log.postcode_full, - log.town_or_city, log.county, ].select(&:present?).join("\n") end diff --git a/app/models/form/lettings/questions/town_or_city.rb b/app/models/form/lettings/questions/town_or_city.rb index 501e9bec4..aeef91e6c 100644 --- a/app/models/form/lettings/questions/town_or_city.rb +++ b/app/models/form/lettings/questions/town_or_city.rb @@ -7,8 +7,4 @@ class Form::Lettings::Questions::TownOrCity < ::Form::Question @plain_label = true @disable_clearing_if_not_routed_or_dynamic_answer_options = true end - - def hidden_in_check_answers?(_log = nil, _current_user = nil) - true - end end diff --git a/app/models/form/sales/questions/address_line1.rb b/app/models/form/sales/questions/address_line1.rb index edee2e7ee..4a189552b 100644 --- a/app/models/form/sales/questions/address_line1.rb +++ b/app/models/form/sales/questions/address_line1.rb @@ -15,7 +15,6 @@ class Form::Sales::Questions::AddressLine1 < ::Form::Question log.address_line1, log.address_line2, log.postcode_full, - log.town_or_city, log.county, ].select(&:present?).join("\n") end diff --git a/app/models/form/sales/questions/town_or_city.rb b/app/models/form/sales/questions/town_or_city.rb index 25acfe036..34c72dfd9 100644 --- a/app/models/form/sales/questions/town_or_city.rb +++ b/app/models/form/sales/questions/town_or_city.rb @@ -7,8 +7,4 @@ class Form::Sales::Questions::TownOrCity < ::Form::Question @plain_label = true @disable_clearing_if_not_routed_or_dynamic_answer_options = true end - - def hidden_in_check_answers?(_log = nil, _current_user = nil) - true - end end diff --git a/spec/models/form/lettings/questions/town_or_city_spec.rb b/spec/models/form/lettings/questions/town_or_city_spec.rb index 8741fb058..750a93cfe 100644 --- a/spec/models/form/lettings/questions/town_or_city_spec.rb +++ b/spec/models/form/lettings/questions/town_or_city_spec.rb @@ -42,8 +42,4 @@ RSpec.describe Form::Lettings::Questions::TownOrCity, type: :model do it "has the correct check_answers_card_number" do expect(question.check_answers_card_number).to be_nil end - - it "has the correct hidden_in_check_answers" do - expect(question.hidden_in_check_answers?).to eq(true) - end end diff --git a/spec/models/form/sales/questions/town_or_city_spec.rb b/spec/models/form/sales/questions/town_or_city_spec.rb index d66315864..6a04e8263 100644 --- a/spec/models/form/sales/questions/town_or_city_spec.rb +++ b/spec/models/form/sales/questions/town_or_city_spec.rb @@ -42,8 +42,4 @@ RSpec.describe Form::Sales::Questions::TownOrCity, type: :model do it "has the correct check_answers_card_number" do expect(question.check_answers_card_number).to be_nil end - - it "has the correct hidden_in_check_answers" do - expect(question.hidden_in_check_answers?).to eq(true) - end end