From 4455e6adf160b702f7df53b6fd252d2fcc808722 Mon Sep 17 00:00:00 2001 From: Rachael Booth Date: Thu, 16 May 2024 09:53:08 +0100 Subject: [PATCH] CLDC-3456: Fix bug preventing location_id from counting as a location qusetion (#2417) --- app/models/lettings_log.rb | 2 +- spec/models/lettings_log_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb index 30c1c6a0b..f428121e7 100644 --- a/app/models/lettings_log.rb +++ b/app/models/lettings_log.rb @@ -575,7 +575,7 @@ class LettingsLog < Log def non_location_setup_questions_completed? form.setup_sections.all? do |section| section.subsections.all? do |subsection| - relevant_qs = subsection.applicable_questions(self).reject { |q| optional_fields.include?(q.id) || %w[scheme_id location].include?(q.id) } + relevant_qs = subsection.applicable_questions(self).reject { |q| optional_fields.include?(q.id) || %w[scheme_id location_id].include?(q.id) } relevant_qs.all? do |question| question.completed?(self) end diff --git a/spec/models/lettings_log_spec.rb b/spec/models/lettings_log_spec.rb index 992677b29..28fd9babf 100644 --- a/spec/models/lettings_log_spec.rb +++ b/spec/models/lettings_log_spec.rb @@ -3549,7 +3549,7 @@ RSpec.describe LettingsLog do end context "when scheme and location have not been completed" do - let(:lettings_log) { build(:lettings_log, :setup_completed, :sh, scheme_id: nil, location: nil) } + let(:lettings_log) { build(:lettings_log, :setup_completed, :sh, scheme_id: nil, location_id: nil) } it "returns true" do expect(lettings_log).to be_non_location_setup_questions_completed