From e7832f72e410ee601b7aada60f8fb69ed35a80d5 Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Wed, 19 Feb 2025 18:21:52 +0000 Subject: [PATCH] Update question numbers tests --- .../form/lettings/pages/address_search_spec.rb | 13 +++++++++++-- .../form/lettings/questions/address_search_spec.rb | 13 +++++++++++-- spec/models/form/sales/pages/address_search_spec.rb | 13 +++++++++++-- .../form/sales/questions/address_search_spec.rb | 13 +++++++++++-- 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/spec/models/form/lettings/pages/address_search_spec.rb b/spec/models/form/lettings/pages/address_search_spec.rb index 9fc323ea4..86c6537a1 100644 --- a/spec/models/form/lettings/pages/address_search_spec.rb +++ b/spec/models/form/lettings/pages/address_search_spec.rb @@ -5,7 +5,8 @@ RSpec.describe Form::Lettings::Pages::AddressSearch, type: :model do let(:page_id) { nil } let(:page_definition) { nil } - let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1))) } + let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date:)) } + let(:start_date) { Time.utc(2024, 4, 1) } it "has correct subsection" do expect(page.subsection).to eq(subsection) @@ -27,7 +28,15 @@ RSpec.describe Form::Lettings::Pages::AddressSearch, type: :model do expect(page.depends_on).to eq([{ "is_supported_housing?" => false, "manual_address_entry_selected" => false }]) end - it "has the correct question_number" do + it "has the correct question number" do expect(page.question_number).to eq(12) end + + context "with 2025/26 form" do + let(:start_date) { Time.utc(2025, 4, 1) } + + it "has the correct question number" do + expect(page.question_number).to eq(16) + end + end end diff --git a/spec/models/form/lettings/questions/address_search_spec.rb b/spec/models/form/lettings/questions/address_search_spec.rb index ba8bf7540..d063a94dc 100644 --- a/spec/models/form/lettings/questions/address_search_spec.rb +++ b/spec/models/form/lettings/questions/address_search_spec.rb @@ -5,7 +5,8 @@ RSpec.describe Form::Lettings::Questions::AddressSearch, type: :model do let(:question_id) { nil } let(:question_definition) { nil } - let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1)))) } + let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date:))) } + let(:start_date) { Time.utc(2024, 4, 1) } it "has correct page" do expect(question.page).to eq(page) @@ -19,10 +20,18 @@ RSpec.describe Form::Lettings::Questions::AddressSearch, type: :model do expect(question.type).to eq("address_search") end - it "has the correct question_number" do + it "has the correct question number" do expect(question.question_number).to eq(12) end + context "with 2025/26 form" do + let(:start_date) { Time.utc(2025, 4, 1) } + + it "has the correct question number" do + expect(question.question_number).to eq(16) + end + end + describe "get_extra_check_answer_value" do context "when address is not present" do let(:log) { build(:lettings_log, manual_address_entry_selected: false) } diff --git a/spec/models/form/sales/pages/address_search_spec.rb b/spec/models/form/sales/pages/address_search_spec.rb index dda853b64..670854694 100644 --- a/spec/models/form/sales/pages/address_search_spec.rb +++ b/spec/models/form/sales/pages/address_search_spec.rb @@ -5,7 +5,8 @@ RSpec.describe Form::Sales::Pages::AddressSearch, type: :model do let(:page_id) { nil } let(:page_definition) { nil } - let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1))) } + let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date:)) } + let(:start_date) { Time.utc(2024, 4, 1) } it "has correct subsection" do expect(page.subsection).to eq(subsection) @@ -27,7 +28,15 @@ RSpec.describe Form::Sales::Pages::AddressSearch, type: :model do expect(page.depends_on).to eq([{ "manual_address_entry_selected" => false }]) end - it "has the correct question_number" do + it "has the correct question number" do expect(page.question_number).to eq(15) end + + context "with 2025/26 form" do + let(:start_date) { Time.utc(2025, 4, 1) } + + it "has the correct question number" do + expect(page.question_number).to eq(13) + end + end end diff --git a/spec/models/form/sales/questions/address_search_spec.rb b/spec/models/form/sales/questions/address_search_spec.rb index 27ec26e6c..bb30cbfa0 100644 --- a/spec/models/form/sales/questions/address_search_spec.rb +++ b/spec/models/form/sales/questions/address_search_spec.rb @@ -5,7 +5,8 @@ RSpec.describe Form::Sales::Questions::AddressSearch, type: :model do let(:question_id) { nil } let(:question_definition) { nil } - let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2025, 4, 1)))) } + let(:page) { instance_double(Form::Page, subsection: instance_double(Form::Subsection, form: instance_double(Form, start_date:))) } + let(:start_date) { Time.utc(2024, 4, 1) } it "has correct page" do expect(question.page).to eq(page) @@ -19,10 +20,18 @@ RSpec.describe Form::Sales::Questions::AddressSearch, type: :model do expect(question.type).to eq("address_search") end - it "has the correct question_number" do + it "has the correct question number" do expect(question.question_number).to eq(15) end + context "with 2025/26 form" do + let(:start_date) { Time.utc(2025, 4, 1) } + + it "has the correct question number" do + expect(question.question_number).to eq(13) + end + end + describe "get_extra_check_answer_value" do context "when address is not present" do let(:log) { build(:sales_log, manual_address_entry_selected: false) }