diff --git a/spec/models/form/sales/pages/gender_identity1_spec.rb b/spec/models/form/sales/pages/gender_identity1_spec.rb index 96d0559da..69bd79e04 100644 --- a/spec/models/form/sales/pages/gender_identity1_spec.rb +++ b/spec/models/form/sales/pages/gender_identity1_spec.rb @@ -1,13 +1,11 @@ require "rails_helper" RSpec.describe Form::Sales::Pages::GenderIdentity1, type: :model do - include CollectionTimeHelper - subject(:page) { described_class.new(page_id, page_definition, subsection) } let(:page_id) { nil } let(:page_definition) { nil } - let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: current_collection_start_date)) } + let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1))) } it "has correct subsection" do expect(page.subsection).to eq(subsection) diff --git a/spec/models/form/sales/pages/gender_identity2_spec.rb b/spec/models/form/sales/pages/gender_identity2_spec.rb index e29153fe3..8d9866244 100644 --- a/spec/models/form/sales/pages/gender_identity2_spec.rb +++ b/spec/models/form/sales/pages/gender_identity2_spec.rb @@ -1,13 +1,11 @@ require "rails_helper" RSpec.describe Form::Sales::Pages::GenderIdentity2, type: :model do - include CollectionTimeHelper - subject(:page) { described_class.new(page_id, page_definition, subsection) } let(:page_id) { nil } let(:page_definition) { nil } - let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: current_collection_start_date)) } + let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1))) } it "has correct subsection" do expect(page.subsection).to eq(subsection) diff --git a/spec/models/form/sales/pages/person_gender_identity_spec.rb b/spec/models/form/sales/pages/person_gender_identity_spec.rb index cca950ab0..73cb734af 100644 --- a/spec/models/form/sales/pages/person_gender_identity_spec.rb +++ b/spec/models/form/sales/pages/person_gender_identity_spec.rb @@ -1,12 +1,10 @@ require "rails_helper" RSpec.describe Form::Sales::Pages::PersonGenderIdentity, type: :model do - include CollectionTimeHelper - subject(:page) { described_class.new(page_id, page_definition, subsection, person_index:) } let(:page_definition) { nil } - let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: current_collection_start_date)) } + let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date: Time.zone.local(2023, 4, 1))) } let(:person_index) { 1 } let(:page_id) { "person_2_gender_identity" } diff --git a/spec/models/form/sales/questions/gender_identity1_spec.rb b/spec/models/form/sales/questions/gender_identity1_spec.rb index 37ce7b3dd..16a7eeca5 100644 --- a/spec/models/form/sales/questions/gender_identity1_spec.rb +++ b/spec/models/form/sales/questions/gender_identity1_spec.rb @@ -1,15 +1,13 @@ require "rails_helper" RSpec.describe Form::Sales::Questions::GenderIdentity1, type: :model do - include CollectionTimeHelper - subject(:question) { described_class.new(question_id, question_definition, page) } let(:question_id) { nil } let(:question_definition) { nil } let(:page) { instance_double(Form::Page) } let(:subsection) { instance_double(Form::Subsection) } - let(:form) { instance_double(Form, start_date: current_collection_start_date) } + let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) } before do allow(page).to receive(:subsection).and_return(subsection) diff --git a/spec/models/form/sales/questions/gender_identity2_spec.rb b/spec/models/form/sales/questions/gender_identity2_spec.rb index 23be0acaf..486f938a9 100644 --- a/spec/models/form/sales/questions/gender_identity2_spec.rb +++ b/spec/models/form/sales/questions/gender_identity2_spec.rb @@ -1,15 +1,13 @@ require "rails_helper" RSpec.describe Form::Sales::Questions::GenderIdentity2, type: :model do - include CollectionTimeHelper - subject(:question) { described_class.new(question_id, question_definition, page) } let(:question_id) { nil } let(:question_definition) { nil } let(:page) { instance_double(Form::Page) } let(:subsection) { instance_double(Form::Subsection) } - let(:form) { instance_double(Form, start_date: current_collection_start_date) } + let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) } before do allow(page).to receive(:subsection).and_return(subsection) diff --git a/spec/models/form/sales/questions/person_gender_identity_spec.rb b/spec/models/form/sales/questions/person_gender_identity_spec.rb index 2998c0004..32c2a30aa 100644 --- a/spec/models/form/sales/questions/person_gender_identity_spec.rb +++ b/spec/models/form/sales/questions/person_gender_identity_spec.rb @@ -1,8 +1,6 @@ require "rails_helper" RSpec.describe Form::Sales::Questions::PersonGenderIdentity, type: :model do - include CollectionTimeHelper - subject(:question) { described_class.new(question_id, question_definition, page, person_index:) } let(:question_id) { "sex2" } @@ -10,7 +8,7 @@ RSpec.describe Form::Sales::Questions::PersonGenderIdentity, type: :model do let(:page) { instance_double(Form::Page) } let(:person_index) { 2 } let(:subsection) { instance_double(Form::Subsection) } - let(:form) { instance_double(Form, start_date: current_collection_start_date) } + let(:form) { instance_double(Form, start_date: Time.zone.local(2023, 4, 1)) } before do allow(page).to receive(:subsection).and_return(subsection)