From b9a26c98d67d45930efa02a1a411869e95f6771e Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 9 Mar 2023 08:11:04 +0000 Subject: [PATCH] Replace hardcoded date --- app/models/form/lettings/questions/la.rb | 2 +- app/models/form/lettings/questions/prevloc.rb | 2 +- spec/models/form/lettings/questions/la_spec.rb | 4 +++- spec/models/form/lettings/questions/prevloc_spec.rb | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/models/form/lettings/questions/la.rb b/app/models/form/lettings/questions/la.rb index 34d5ba2da..e69a7216e 100644 --- a/app/models/form/lettings/questions/la.rb +++ b/app/models/form/lettings/questions/la.rb @@ -10,6 +10,6 @@ class Form::Lettings::Questions::La < ::Form::Question end def answer_options - { "" => "Select an option" }.merge(LocalAuthority.active(Time.zone.local(2023, 4, 1)).england.map { |la| [la.code, la.name] }.to_h) + { "" => "Select an option" }.merge(LocalAuthority.active(form.start_date).england.map { |la| [la.code, la.name] }.to_h) end end diff --git a/app/models/form/lettings/questions/prevloc.rb b/app/models/form/lettings/questions/prevloc.rb index 4e9a7bf2f..06d23eed4 100644 --- a/app/models/form/lettings/questions/prevloc.rb +++ b/app/models/form/lettings/questions/prevloc.rb @@ -11,6 +11,6 @@ class Form::Lettings::Questions::Prevloc < ::Form::Question end def answer_options - { "" => "Select an option" }.merge(LocalAuthority.active(Time.zone.local(2023, 4, 1)).map { |la| [la.code, la.name] }.to_h) + { "" => "Select an option" }.merge(LocalAuthority.active(form.start_date).map { |la| [la.code, la.name] }.to_h) end end diff --git a/spec/models/form/lettings/questions/la_spec.rb b/spec/models/form/lettings/questions/la_spec.rb index 0451e092e..05ebb2d69 100644 --- a/spec/models/form/lettings/questions/la_spec.rb +++ b/spec/models/form/lettings/questions/la_spec.rb @@ -5,7 +5,9 @@ RSpec.describe Form::Lettings::Questions::La, type: :model do let(:question_id) { nil } let(:question_definition) { nil } - let(:page) { instance_double(Form::Page) } + let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date:)) } + let(:page) { instance_double(Form::Page, subsection:) } + let(:start_date) { Time.utc(2023, 4, 1) } it "has the correct answer_options" do Rails.application.load_seed diff --git a/spec/models/form/lettings/questions/prevloc_spec.rb b/spec/models/form/lettings/questions/prevloc_spec.rb index ee0a0f4a5..fbecaaceb 100644 --- a/spec/models/form/lettings/questions/prevloc_spec.rb +++ b/spec/models/form/lettings/questions/prevloc_spec.rb @@ -5,8 +5,8 @@ RSpec.describe Form::Lettings::Questions::Prevloc, type: :model do let(:question_id) { nil } let(:question_definition) { nil } - let(:page) { instance_double(Form::Page) } - + let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date:)) } + let(:page) { instance_double(Form::Page, subsection:) } let(:start_date) { Time.utc(2023, 4, 1) } it "has the correct answer_options" do