diff --git a/app/models/form/lettings/pages/person_sex_registered_at_birth.rb b/app/models/form/lettings/pages/person_sex_registered_at_birth.rb index 3c5b033ba..ea1586f5e 100644 --- a/app/models/form/lettings/pages/person_sex_registered_at_birth.rb +++ b/app/models/form/lettings/pages/person_sex_registered_at_birth.rb @@ -6,7 +6,7 @@ class Form::Lettings::Pages::PersonSexRegisteredAtBirth < ::Form::Page @id = "person_#{person_index}_sex_registered_at_birth" @person_index = person_index @depends_on = [ - { "details_known_#{person_index}" => 1 }, + { "details_known_#{person_index}" => 0 }, ] end diff --git a/app/models/form/lettings/questions/person_sex_registered_at_birth.rb b/app/models/form/lettings/questions/person_sex_registered_at_birth.rb index 0ac96f841..fa9ac4545 100644 --- a/app/models/form/lettings/questions/person_sex_registered_at_birth.rb +++ b/app/models/form/lettings/questions/person_sex_registered_at_birth.rb @@ -6,11 +6,11 @@ class Form::Lettings::Questions::PersonSexRegisteredAtBirth < ::Form::Question @type = "radio" @check_answers_card_number = person_index @inferred_check_answers_value = [{ - "condition" => { - id => "R", - }, - "value" => "Person prefers not to say", - }] + "condition" => { + id => "R", + }, + "value" => "Person prefers not to say", + }] @answer_options = ANSWER_OPTIONS @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max] end diff --git a/app/services/exports/lettings_log_export_service.rb b/app/services/exports/lettings_log_export_service.rb index a71423d81..811d0e439 100644 --- a/app/services/exports/lettings_log_export_service.rb +++ b/app/services/exports/lettings_log_export_service.rb @@ -183,7 +183,7 @@ module Exports included_fields.merge(PRE_2024_EXPORT_FIELDS) end - if !lettings_log.form.start_year_2025_or_later? + unless lettings_log.form.start_year_2025_or_later? included_fields.merge(PRE_2025_EXPORT_FIELDS) end diff --git a/spec/models/form/lettings/pages/person_sex_registered_at_birth_spec.rb b/spec/models/form/lettings/pages/person_sex_registered_at_birth_spec.rb index 098911bfc..628fe5f30 100644 --- a/spec/models/form/lettings/pages/person_sex_registered_at_birth_spec.rb +++ b/spec/models/form/lettings/pages/person_sex_registered_at_birth_spec.rb @@ -30,7 +30,7 @@ RSpec.describe Form::Lettings::Pages::PersonSexRegisteredAtBirth, type: :model d end it "has correct depends_on" do - expect(page.depends_on).to eq([{ "details_known_2" => 1 }]) + expect(page.depends_on).to eq([{ "details_known_2" => 0 }]) end end @@ -47,7 +47,7 @@ RSpec.describe Form::Lettings::Pages::PersonSexRegisteredAtBirth, type: :model d end it "has correct depends_on" do - expect(page.depends_on).to eq([{ "details_known_3" => 1 }]) + expect(page.depends_on).to eq([{ "details_known_3" => 0 }]) end end @@ -64,7 +64,7 @@ RSpec.describe Form::Lettings::Pages::PersonSexRegisteredAtBirth, type: :model d end it "has correct depends_on" do - expect(page.depends_on).to eq([{ "details_known_4" => 1 }]) + expect(page.depends_on).to eq([{ "details_known_4" => 0 }]) end end @@ -81,7 +81,7 @@ RSpec.describe Form::Lettings::Pages::PersonSexRegisteredAtBirth, type: :model d end it "has correct depends_on" do - expect(page.depends_on).to eq([{ "details_known_5" => 1 }]) + expect(page.depends_on).to eq([{ "details_known_5" => 0 }]) end end @@ -98,7 +98,7 @@ RSpec.describe Form::Lettings::Pages::PersonSexRegisteredAtBirth, type: :model d end it "has correct depends_on" do - expect(page.depends_on).to eq([{ "details_known_6" => 1 }]) + expect(page.depends_on).to eq([{ "details_known_6" => 0 }]) end end @@ -115,7 +115,7 @@ RSpec.describe Form::Lettings::Pages::PersonSexRegisteredAtBirth, type: :model d end it "has correct depends_on" do - expect(page.depends_on).to eq([{ "details_known_7" => 1 }]) + expect(page.depends_on).to eq([{ "details_known_7" => 0 }]) end end @@ -132,7 +132,7 @@ RSpec.describe Form::Lettings::Pages::PersonSexRegisteredAtBirth, type: :model d end it "has correct depends_on" do - expect(page.depends_on).to eq([{ "details_known_8" => 1 }]) + expect(page.depends_on).to eq([{ "details_known_8" => 0 }]) end end end diff --git a/spec/models/form/lettings/questions/person_sex_registered_at_birth_spec.rb b/spec/models/form/lettings/questions/person_sex_registered_at_birth_spec.rb index e80417c5b..7bf47da65 100644 --- a/spec/models/form/lettings/questions/person_sex_registered_at_birth_spec.rb +++ b/spec/models/form/lettings/questions/person_sex_registered_at_birth_spec.rb @@ -145,8 +145,8 @@ RSpec.describe Form::Lettings::Questions::PersonSexRegisteredAtBirth, type: :mod it "has the correct inferred_check_answers_value" do expect(question.inferred_check_answers_value).to eq([ - { "condition" => { "sexrab7" => "R" }, "value" => "Person prefers not to say" }, - ]) + { "condition" => { "sexrab7" => "R" }, "value" => "Person prefers not to say" }, + ]) end end @@ -164,8 +164,8 @@ RSpec.describe Form::Lettings::Questions::PersonSexRegisteredAtBirth, type: :mod it "has the correct inferred_check_answers_value" do expect(question.inferred_check_answers_value).to eq([ - { "condition" => { "sexrab8" => "R" }, "value" => "Person prefers not to say" }, - ]) + { "condition" => { "sexrab8" => "R" }, "value" => "Person prefers not to say" }, + ]) end end end