baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

CLDC-3151 Update reason for leaving for 24/25 (#2192) 

* feat: update ansewrs, hint text and test

* refactor: lint

* refactor: save lines
pull/2224/head
natdeanlewissoftwire 11 months ago committed by GitHub
parent
5bf30c37c3
commit
8ce222dcaa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 286 additions and 244 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 190
      app/models/form/lettings/questions/reason.rb
  2. 40
      app/models/form/lettings/questions/reason_renewal.rb
  3. 85
      spec/models/form/lettings/questions/reason_renewal_spec.rb
  4. 215
      spec/models/form/lettings/questions/reason_spec.rb

190
app/models/form/lettings/questions/reason.rb
Unescape View File

@ -6,8 +6,7 @@ class Form::Lettings::Questions::Reason < ::Form::Question
@header = "What is the tenant’s main reason for the household leaving their last settled home?" @header = "What is the tenant’s main reason for the household leaving their last settled home?"
@type = "radio" @type = "radio"
@check_answers_card_number = 0 @check_answers_card_number = 0
@hint_text = "The tenant’s ‘last settled home’ is their last long-standing home. For tenants who were in temporary accommodation or sleeping rough, their last settled home is where they were living previously." @hint_text = form.start_year_after_2024? ? "The tenant’s ‘last settled home’ is their last long-standing home. For tenants who were in temporary accommodation, sleeping rough or otherwise homeless, their last settled home is where they were living previously." : "The tenant’s ‘last settled home’ is their last long-standing home. For tenants who were in temporary accommodation or sleeping rough, their last settled home is where they were living previously."
@answer_options = ANSWER_OPTIONS
@conditional_for = { @conditional_for = {
"reasonother" => [ "reasonother" => [
20, 20,
@ -16,114 +15,81 @@ class Form::Lettings::Questions::Reason < ::Form::Question
@question_number = 77 @question_number = 77
end end
ANSWER_OPTIONS = { def answer_options
"40" => { if form.start_year_after_2024?
"value" => "End of assured shorthold tenancy (no fault)", {
}, "50" => { "value" => "End of social housing tenancy - no fault" },
"41" => { "51" => { "value" => "End of social housing tenancy - evicted due to anti-social behaviour (ASB)" },
"value" => "End of assured shorthold tenancy (eviction or tenant at fault)", "52" => { "value" => "End of social housing tenancy - evicted due to rent arrears" },
}, "53" => { "value" => "End of social housing tenancy - evicted for any other reason" },
"42" => { "1" => { "value" => "Permanently decanted from another property owned by this landlord" },
"value" => "End of fixed term tenancy (no fault)", "2" => { "value" => "Left home country as a refugee" },
}, "45" => { "value" => "Discharged from prison" },
"43" => { "46" => { "value" => "Discharged from long-stay hospital or similar institution" },
"value" => "End of fixed term tenancy (eviction or tenant at fault)", "4" => { "value" => "Loss of tied accommodation" },
}, "9" => { "value" => "Asked to leave by family or friends" },
"1" => { "8" => { "value" => "Relationship breakdown (non-violent) with partner" },
"value" => "Permanently decanted from another property owned by this landlord", "44" => { "value" => "Death of household member in last settled accommodation" },
}, "16" => { "value" => "To move nearer to family, friends or school" },
"46" => { "17" => { "value" => "To move nearer to work" },
"value" => "Discharged from long-stay hospital or similar institution", "48" => { "value" => "Domestic abuse - previously joint tenancy with partner" },
}, "49" => { "value" => "Domestic abuse - other" },
"45" => { "10" => { "value" => "Racial harassment" },
"value" => "Discharged from prison", "31" => { "value" => "Hate crime" },
}, "11" => { "value" => "Other problems with neighbours" },
"2" => { "34" => { "value" => "Repossession" },
"value" => "Left home country as a refugee", "54" => { "value" => "Could no longer afford rent or mortgage" },
}, "12" => { "value" => "Property unsuitable because of overcrowding" },
"4" => { "13" => { "value" => "Property unsuitable because of ill health or disability" },
"value" => "Loss of tied accommodation", "14" => { "value" => "Property unsuitable because of poor condition" },
}, "29" => { "value" => "Under occupation (offered incentive to downsize)" },
"9" => { "30" => { "value" => "Under occupation (no incentive)" },
"value" => "Asked to leave by family or friends", "18" => { "value" => "To move to accommodation with support" },
}, "19" => { "value" => "To move to independent accommodation" },
"44" => { "20" => { "value" => "Other" },
"value" => "Death of household member in last settled accommodation", "28" => { "value" => "Don’t know" },
}, "divider" => { "value" => true },
"8" => { "47" => { "value" => "Tenant prefers not to say" },
"value" => "Relationship breakdown (non-violent) with partner", }.freeze
}, else
"16" => { {
"value" => "To move nearer to family, friends or school", "40" => { "value" => "End of assured shorthold tenancy (no fault)" },
}, "41" => { "value" => "End of assured shorthold tenancy (eviction or tenant at fault)" },
"17" => { "42" => { "value" => "End of fixed term tenancy (no fault)" },
"value" => "To move nearer to work", "43" => { "value" => "End of fixed term tenancy (eviction or tenant at fault)" },
}, "1" => { "value" => "Permanently decanted from another property owned by this landlord" },
"48" => { "46" => { "value" => "Discharged from long-stay hospital or similar institution" },
"value" => "Domestic abuse - previously joint tenancy with partner", "45" => { "value" => "Discharged from prison" },
}, "2" => { "value" => "Left home country as a refugee" },
"49" => { "4" => { "value" => "Loss of tied accommodation" },
"value" => "Domestic abuse - other", "9" => { "value" => "Asked to leave by family or friends" },
}, "44" => { "value" => "Death of household member in last settled accommodation" },
"31" => { "8" => { "value" => "Relationship breakdown (non-violent) with partner" },
"value" => "Hate crime", "16" => { "value" => "To move nearer to family, friends or school" },
}, "17" => { "value" => "To move nearer to work" },
"10" => { "48" => { "value" => "Domestic abuse - previously joint tenancy with partner" },
"value" => "Racial harassment", "49" => { "value" => "Domestic abuse - other" },
}, "31" => { "value" => "Hate crime" },
"11" => { "10" => { "value" => "Racial harassment" },
"value" => "Other problems with neighbours", "11" => { "value" => "Other problems with neighbours" },
}, "35" => { "value" => "Couldn’t afford fees attached to renewing the tenancy" },
"35" => { "36" => { "value" => "Couldn’t afford increase in rent" },
"value" => "Couldn’t afford fees attached to renewing the tenancy", "38" => { "value" => "Couldn’t afford rent or mortgage (employment)" },
}, "37" => { "value" => "Couldn’t afford rent or mortgage (welfare reforms)" },
"36" => { "39" => { "value" => "Couldn’t afford rent or mortgage (other)" },
"value" => "Couldn’t afford increase in rent", "34" => { "value" => "Repossession" },
}, "12" => { "value" => "Property unsuitable because of overcrowding" },
"38" => { "13" => { "value" => "Property unsuitable because of ill health or disability" },
"value" => "Couldn’t afford rent or mortgage (employment)", "14" => { "value" => "Property unsuitable because of poor condition" },
}, "18" => { "value" => "To move to accommodation with support" },
"37" => { "19" => { "value" => "To move to independent accommodation" },
"value" => "Couldn’t afford rent or mortgage (welfare reforms)", "30" => { "value" => "Under occupation (no incentive)" },
}, "29" => { "value" => "Under occupation (offered incentive to downsize)" },
"39" => { "20" => { "value" => "Other" },
"value" => "Couldn’t afford rent or mortgage (other)", "47" => { "value" => "Tenant prefers not to say" },
}, "divider" => { "value" => true },
"34" => { "28" => { "value" => "Don’t know" },
"value" => "Repossession", }.freeze
}, end
"12" => { end
"value" => "Property unsuitable because of overcrowding",
},
"13" => {
"value" => "Property unsuitable because of ill health or disability",
},
"14" => {
"value" => "Property unsuitable because of poor condition",
},
"18" => {
"value" => "To move to accommodation with support",
},
"19" => {
"value" => "To move to independent accommodation",
},
"30" => {
"value" => "Under occupation (no incentive)",
},
"29" => {
"value" => "Under occupation (offered incentive to downsize)",
},
"20" => {
"value" => "Other",
},
"47" => {
"value" => "Tenant prefers not to say",
},
"divider" => {
"value" => true,
},
"28" => {
"value" => "Don’t know",
},
}.freeze
end end

40
app/models/form/lettings/questions/reason_renewal.rb
Unescape View File

@ -7,7 +7,6 @@ class Form::Lettings::Questions::ReasonRenewal < ::Form::Question
@type = "radio" @type = "radio"
@check_answers_card_number = 0 @check_answers_card_number = 0
@hint_text = "You told us this letting is a renewal. We have removed some options because of this." @hint_text = "You told us this letting is a renewal. We have removed some options because of this."
@answer_options = ANSWER_OPTIONS
@question_number = 77 @question_number = 77
@conditional_for = { @conditional_for = {
"reasonother" => [ "reasonother" => [
@ -16,20 +15,27 @@ class Form::Lettings::Questions::ReasonRenewal < ::Form::Question
} }
end end
ANSWER_OPTIONS = { def answer_options
"40" => { "value" => "End of assured shorthold tenancy (no fault)" }, if form.start_year_after_2024?
"42" => { "value" => "End of fixed term tenancy (no fault)" }, {
"20" => { "50" => { "value" => "End of social housing tenancy - no fault" },
"value" => "Other", "51" => { "value" => "End of social housing tenancy - evicted due to anti-social behaviour (ASB)" },
}, "52" => { "value" => "End of social housing tenancy - evicted due to rent arrears" },
"47" => { "53" => { "value" => "End of social housing tenancy - evicted for any other reason" },
"value" => "Tenant prefers not to say", "20" => { "value" => "Other" },
}, "47" => { "value" => "Tenant prefers not to say" },
"divider" => { "divider" => { "value" => true },
"value" => true, "28" => { "value" => "Don’t know" },
}, }.freeze
"28" => { else
"value" => "Don’t know", {
}, "40" => { "value" => "End of assured shorthold tenancy (no fault)" },
}.freeze "42" => { "value" => "End of fixed term tenancy (no fault)" },
"20" => { "value" => "Other" },
"47" => { "value" => "Tenant prefers not to say" },
"divider" => { "value" => true },
"28" => { "value" => "Don’t know" },
}.freeze
end
end
end end

85
spec/models/form/lettings/questions/reason_renewal_spec.rb
Unescape View File

@ -0,0 +1,85 @@
require "rails_helper"
RSpec.describe Form::Lettings::Questions::ReasonRenewal, type: :model do
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) }
before do
allow(form).to receive(:start_year_after_2024?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
it "has correct page" do
expect(question.page).to eq(page)
end
it "has the correct id" do
expect(question.id).to eq("reason")
end
it "has the correct header" do
expect(question.header).to eq("What is the tenant’s main reason for the household leaving their last settled home?")
end
it "has the correct check_answer_label" do
expect(question.check_answer_label).to eq("Reason for leaving last settled home")
end
it "has the correct type" do
expect(question.type).to eq("radio")
end
it "has the correct check_answers_card_number" do
expect(question.check_answers_card_number).to eq(0)
end
it "has the correct hint" do
expect(question.hint_text).to eq("You told us this letting is a renewal. We have removed some options because of this.")
end
it "has the correct conditional_for" do
expect(question.conditional_for).to eq({ "reasonother" => [20] })
end
it "is not marked as derived" do
expect(question).not_to be_derived
end
context "with 2023/24 form" do
it "has the correct answer_options" do
expect(question.answer_options).to eq({
"40" => { "value" => "End of assured shorthold tenancy (no fault)" },
"42" => { "value" => "End of fixed term tenancy (no fault)" },
"20" => { "value" => "Other" },
"47" => { "value" => "Tenant prefers not to say" },
"divider" => { "value" => true },
"28" => { "value" => "Don’t know" },
})
end
end
context "with 2024/25 form" do
before do
allow(form).to receive(:start_year_after_2024?).and_return(true)
end
it "has the correct answer_options" do
expect(question.answer_options).to eq({
"50" => { "value" => "End of social housing tenancy - no fault" },
"51" => { "value" => "End of social housing tenancy - evicted due to anti-social behaviour (ASB)" },
"52" => { "value" => "End of social housing tenancy - evicted due to rent arrears" },
"53" => { "value" => "End of social housing tenancy - evicted for any other reason" },
"20" => { "value" => "Other" },
"47" => { "value" => "Tenant prefers not to say" },
"divider" => { "value" => true },
"28" => { "value" => "Don’t know" },
})
end
end
end

215
spec/models/form/lettings/questions/reason_spec.rb
Unescape View File

@ -6,6 +6,14 @@ RSpec.describe Form::Lettings::Questions::Reason, type: :model do
let(:question_id) { nil } let(:question_id) { nil }
let(:question_definition) { nil } let(:question_definition) { nil }
let(:page) { instance_double(Form::Page) } let(:page) { instance_double(Form::Page) }
let(:subsection) { instance_double(Form::Subsection) }
let(:form) { instance_double(Form) }
before do
allow(form).to receive(:start_year_after_2024?).and_return(false)
allow(page).to receive(:subsection).and_return(subsection)
allow(subsection).to receive(:form).and_return(form)
end
it "has correct page" do it "has correct page" do
expect(question.page).to eq(page) expect(question.page).to eq(page)
@ -31,10 +39,6 @@ RSpec.describe Form::Lettings::Questions::Reason, type: :model do
expect(question.check_answers_card_number).to eq(0) expect(question.check_answers_card_number).to eq(0)
end end
it "has the correct hint" do
expect(question.hint_text).to eq("The tenant’s ‘last settled home’ is their last long-standing home. For tenants who were in temporary accommodation or sleeping rough, their last settled home is where they were living previously.")
end
it "has the correct conditional_for" do it "has the correct conditional_for" do
expect(question.conditional_for).to eq({ "reasonother" => [20] }) expect(question.conditional_for).to eq({ "reasonother" => [20] })
end end
@ -43,116 +47,97 @@ RSpec.describe Form::Lettings::Questions::Reason, type: :model do
expect(question).not_to be_derived expect(question).not_to be_derived
end end
it "has the correct answer_options" do context "with 2023/24 form" do
expect(question.answer_options).to eq({ it "has the correct hint" do
"40" => { expect(question.hint_text).to eq("The tenant’s ‘last settled home’ is their last long-standing home. For tenants who were in temporary accommodation or sleeping rough, their last settled home is where they were living previously.")
"value" => "End of assured shorthold tenancy (no fault)", end
},
"41" => { it "has the correct answer_options" do
"value" => "End of assured shorthold tenancy (eviction or tenant at fault)", expect(question.answer_options).to eq({
}, "40" => { "value" => "End of assured shorthold tenancy (no fault)" },
"42" => { "41" => { "value" => "End of assured shorthold tenancy (eviction or tenant at fault)" },
"value" => "End of fixed term tenancy (no fault)", "42" => { "value" => "End of fixed term tenancy (no fault)" },
}, "43" => { "value" => "End of fixed term tenancy (eviction or tenant at fault)" },
"43" => { "1" => { "value" => "Permanently decanted from another property owned by this landlord" },
"value" => "End of fixed term tenancy (eviction or tenant at fault)", "46" => { "value" => "Discharged from long-stay hospital or similar institution" },
}, "45" => { "value" => "Discharged from prison" },
"1" => { "2" => { "value" => "Left home country as a refugee" },
"value" => "Permanently decanted from another property owned by this landlord", "4" => { "value" => "Loss of tied accommodation" },
}, "9" => { "value" => "Asked to leave by family or friends" },
"46" => { "44" => { "value" => "Death of household member in last settled accommodation" },
"value" => "Discharged from long-stay hospital or similar institution", "8" => { "value" => "Relationship breakdown (non-violent) with partner" },
}, "16" => { "value" => "To move nearer to family, friends or school" },
"45" => { "17" => { "value" => "To move nearer to work" },
"value" => "Discharged from prison", "48" => { "value" => "Domestic abuse - previously joint tenancy with partner" },
}, "49" => { "value" => "Domestic abuse - other" },
"2" => { "31" => { "value" => "Hate crime" },
"value" => "Left home country as a refugee", "10" => { "value" => "Racial harassment" },
}, "11" => { "value" => "Other problems with neighbours" },
"4" => { "35" => { "value" => "Couldn’t afford fees attached to renewing the tenancy" },
"value" => "Loss of tied accommodation", "36" => { "value" => "Couldn’t afford increase in rent" },
}, "38" => { "value" => "Couldn’t afford rent or mortgage (employment)" },
"9" => { "37" => { "value" => "Couldn’t afford rent or mortgage (welfare reforms)" },
"value" => "Asked to leave by family or friends", "39" => { "value" => "Couldn’t afford rent or mortgage (other)" },
}, "34" => { "value" => "Repossession" },
"44" => { "12" => { "value" => "Property unsuitable because of overcrowding" },
"value" => "Death of household member in last settled accommodation", "13" => { "value" => "Property unsuitable because of ill health or disability" },
}, "14" => { "value" => "Property unsuitable because of poor condition" },
"8" => { "18" => { "value" => "To move to accommodation with support" },
"value" => "Relationship breakdown (non-violent) with partner", "19" => { "value" => "To move to independent accommodation" },
}, "30" => { "value" => "Under occupation (no incentive)" },
"16" => { "29" => { "value" => "Under occupation (offered incentive to downsize)" },
"value" => "To move nearer to family, friends or school", "20" => { "value" => "Other" },
}, "47" => { "value" => "Tenant prefers not to say" },
"17" => { "divider" => { "value" => true },
"value" => "To move nearer to work", "28" => { "value" => "Don’t know" },
}, })
"48" => { end
"value" => "Domestic abuse - previously joint tenancy with partner", end
},
"49" => { context "with 2024/25 form" do
"value" => "Domestic abuse - other", before do
}, allow(form).to receive(:start_year_after_2024?).and_return(true)
"31" => { end
"value" => "Hate crime",
}, it "has the correct hint" do
"10" => { expect(question.hint_text).to eq("The tenant’s ‘last settled home’ is their last long-standing home. For tenants who were in temporary accommodation, sleeping rough or otherwise homeless, their last settled home is where they were living previously.")
"value" => "Racial harassment", end
},
"11" => { it "has the correct answer_options" do
"value" => "Other problems with neighbours", expect(question.answer_options).to eq({
}, "50" => { "value" => "End of social housing tenancy - no fault" },
"35" => { "51" => { "value" => "End of social housing tenancy - evicted due to anti-social behaviour (ASB)" },
"value" => "Couldn’t afford fees attached to renewing the tenancy", "52" => { "value" => "End of social housing tenancy - evicted due to rent arrears" },
}, "53" => { "value" => "End of social housing tenancy - evicted for any other reason" },
"36" => { "1" => { "value" => "Permanently decanted from another property owned by this landlord" },
"value" => "Couldn’t afford increase in rent", "2" => { "value" => "Left home country as a refugee" },
}, "45" => { "value" => "Discharged from prison" },
"38" => { "46" => { "value" => "Discharged from long-stay hospital or similar institution" },
"value" => "Couldn’t afford rent or mortgage (employment)", "4" => { "value" => "Loss of tied accommodation" },
}, "9" => { "value" => "Asked to leave by family or friends" },
"37" => { "8" => { "value" => "Relationship breakdown (non-violent) with partner" },
"value" => "Couldn’t afford rent or mortgage (welfare reforms)", "44" => { "value" => "Death of household member in last settled accommodation" },
}, "16" => { "value" => "To move nearer to family, friends or school" },
"39" => { "17" => { "value" => "To move nearer to work" },
"value" => "Couldn’t afford rent or mortgage (other)", "48" => { "value" => "Domestic abuse - previously joint tenancy with partner" },
}, "49" => { "value" => "Domestic abuse - other" },
"34" => { "10" => { "value" => "Racial harassment" },
"value" => "Repossession", "31" => { "value" => "Hate crime" },
}, "11" => { "value" => "Other problems with neighbours" },
"12" => { "34" => { "value" => "Repossession" },
"value" => "Property unsuitable because of overcrowding", "54" => { "value" => "Could no longer afford rent or mortgage" },
}, "12" => { "value" => "Property unsuitable because of overcrowding" },
"13" => { "13" => { "value" => "Property unsuitable because of ill health or disability" },
"value" => "Property unsuitable because of ill health or disability", "14" => { "value" => "Property unsuitable because of poor condition" },
}, "29" => { "value" => "Under occupation (offered incentive to downsize)" },
"14" => { "30" => { "value" => "Under occupation (no incentive)" },
"value" => "Property unsuitable because of poor condition", "18" => { "value" => "To move to accommodation with support" },
}, "19" => { "value" => "To move to independent accommodation" },
"18" => { "20" => { "value" => "Other" },
"value" => "To move to accommodation with support", "28" => { "value" => "Don’t know" },
}, "divider" => { "value" => true },
"19" => { "47" => { "value" => "Tenant prefers not to say" },
"value" => "To move to independent accommodation", })
}, end
"30" => {
"value" => "Under occupation (no incentive)",
},
"29" => {
"value" => "Under occupation (offered incentive to downsize)",
},
"20" => {
"value" => "Other",
},
"47" => {
"value" => "Tenant prefers not to say",
},
"divider" => {
"value" => true,
},
"28" => {
"value" => "Don’t know",
},
})
end end
end end

Write Preview
Loading…
Cancel
Save