From a152044362c9baafa4622cef30d584189f8cb5b1 Mon Sep 17 00:00:00 2001 From: Arthur Campbell Date: Fri, 10 Mar 2023 10:28:04 +0000 Subject: [PATCH] change the condition to avoid conflicts with 2034 and cover that ticket in this one --- app/models/form/lettings/pages/tenancy_length.rb | 2 +- app/models/lettings_log.rb | 4 ++-- spec/models/form/lettings/pages/tenancy_length_spec.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/form/lettings/pages/tenancy_length.rb b/app/models/form/lettings/pages/tenancy_length.rb index 554477294..cb533dcf9 100644 --- a/app/models/form/lettings/pages/tenancy_length.rb +++ b/app/models/form/lettings/pages/tenancy_length.rb @@ -2,7 +2,7 @@ class Form::Lettings::Pages::TenancyLength < ::Form::Page def initialize(id, hsh, subsection) super @id = "tenancy_length" - @depends_on = [{ "tenancy_type_fixed_term_or_other?" => true }] + @depends_on = [{ "tenancy_type_fixed_term?" => true }] end def questions diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb index 48866426b..aa6278f96 100644 --- a/app/models/lettings_log.rb +++ b/app/models/lettings_log.rb @@ -205,8 +205,8 @@ class LettingsLog < Log startertenancy == 1 end - def tenancy_type_fixed_term_or_other? - [4, 6, 3].include? tenancy + def tenancy_type_fixed_term? + [4, 6].include? tenancy end def is_general_needs? diff --git a/spec/models/form/lettings/pages/tenancy_length_spec.rb b/spec/models/form/lettings/pages/tenancy_length_spec.rb index e633a9b9e..d4ea920ae 100644 --- a/spec/models/form/lettings/pages/tenancy_length_spec.rb +++ b/spec/models/form/lettings/pages/tenancy_length_spec.rb @@ -26,6 +26,6 @@ RSpec.describe Form::Lettings::Pages::TenancyLength, type: :model do end it "has the correct depends_on" do - expect(page.depends_on).to eq [{ "tenancy_type_fixed_term_or_other?" => true }] + expect(page.depends_on).to eq [{ "tenancy_type_fixed_term?" => true }] end end