Browse Source

CLDC-2049: Use year instead of years when only one is displayed (#2262)

* CLDC-2049: Use year instead of years when only one is displayed

* CLDC-2049: Also use year instead of years for mortgage question
pull/2283/head
Robert Sullivan 10 months ago committed by GitHub
parent
commit
24a3f3eee8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 5
      app/models/form/sales/questions/living_before_purchase_years.rb
  2. 5
      app/models/form/sales/questions/mortgage_length.rb
  3. 25
      spec/models/form/sales/questions/living_before_purchase_years_spec.rb
  4. 20
      spec/models/form/sales/questions/mortgage_length_spec.rb

5
app/models/form/sales/questions/living_before_purchase_years.rb

@ -10,7 +10,6 @@ class Form::Sales::Questions::LivingBeforePurchaseYears < ::Form::Question
@max = 80
@step = 1
@width = 5
@suffix = " years"
@ownershipsch = ownershipsch
@question_number = question_number
end
@ -39,4 +38,8 @@ class Form::Sales::Questions::LivingBeforePurchaseYears < ::Form::Question
99
end
end
def suffix_label(log)
" #{'year'.pluralize(log[id])}"
end
end

5
app/models/form/sales/questions/mortgage_length.rb

@ -9,7 +9,6 @@ class Form::Sales::Questions::MortgageLength < ::Form::Question
@max = 60
@step = 1
@width = 5
@suffix = " years"
@hint_text = "You should round up to the nearest year. Value should not exceed 60 years."
@ownershipsch = ownershipsch
@question_number = question_number
@ -25,4 +24,8 @@ class Form::Sales::Questions::MortgageLength < ::Form::Question
114
end
end
def suffix_label(log)
" #{'year'.pluralize(log[id])}"
end
end

25
spec/models/form/sales/questions/living_before_purchase_years_spec.rb

@ -5,6 +5,7 @@ RSpec.describe Form::Sales::Questions::LivingBeforePurchaseYears, type: :model d
let(:question_id) { nil }
let(:question_definition) { nil }
let(:start_date) { Time.utc(2024, 2, 8) }
let(:subsection) { instance_double(Form::Subsection, form: instance_double(Form, start_date:)) }
let(:page) { instance_double(Form::Page, subsection:) }
@ -47,10 +48,6 @@ RSpec.describe Form::Sales::Questions::LivingBeforePurchaseYears, type: :model d
expect(question.step).to eq(1)
end
it "has correct suffix" do
expect(question.suffix).to eq(" years")
end
it "has correct min" do
expect(question.min).to eq(0)
end
@ -99,10 +96,6 @@ RSpec.describe Form::Sales::Questions::LivingBeforePurchaseYears, type: :model d
expect(question.step).to eq(1)
end
it "has correct suffix" do
expect(question.suffix).to eq(" years")
end
it "has correct min" do
expect(question.min).to eq(0)
end
@ -111,4 +104,20 @@ RSpec.describe Form::Sales::Questions::LivingBeforePurchaseYears, type: :model d
expect(question.max).to eq(80)
end
end
context "when 1 year" do
let(:sales_log) { FactoryBot.build(:sales_log, proplen: 1) }
it "has correct suffix" do
expect(question.suffix_label(sales_log)).to eq(" year")
end
end
context "when multiple years" do
let(:sales_log) { FactoryBot.build(:sales_log, proplen: 5) }
it "has correct suffix" do
expect(question.suffix_label(sales_log)).to eq(" years")
end
end
end

20
spec/models/form/sales/questions/mortgage_length_spec.rb

@ -41,10 +41,6 @@ RSpec.describe Form::Sales::Questions::MortgageLength, type: :model do
expect(question.width).to eq(5)
end
it "has correct suffix" do
expect(question.suffix).to eq(" years")
end
it "has correct min" do
expect(question.min).to eq(0)
end
@ -52,4 +48,20 @@ RSpec.describe Form::Sales::Questions::MortgageLength, type: :model do
it "has correct max" do
expect(question.max).to eq(60)
end
context "when 1 year" do
let(:sales_log) { FactoryBot.build(:sales_log, mortlen: 1) }
it "has correct suffix" do
expect(question.suffix_label(sales_log)).to eq(" year")
end
end
context "when multiple years" do
let(:sales_log) { FactoryBot.build(:sales_log, mortlen: 5) }
it "has correct suffix" do
expect(question.suffix_label(sales_log)).to eq(" years")
end
end
end

Loading…
Cancel
Save