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

Merge branch 'main' into CLDC-2034-tenancy-type-other-fix 

# Conflicts:
#	app/models/form/sales/questions/previous_tenure_buyer2.rb
#	spec/models/form/sales/questions/previous_tenure_buyer2_spec.rb
pull/1403/head
natdeanlewissoftwire 3 years ago
parent
6fbcbaddf7 cb983d16b0
commit
14289cbc8f
4 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/models/form/sales/questions/buyer1_previous_tenure.rb
  2. 4
      app/models/form/sales/questions/previous_tenure_buyer2.rb
  3. 4
      spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb
  4. 4
      spec/models/form/sales/questions/previous_tenure_buyer2_spec.rb

4
app/models/form/sales/questions/buyer1_previous_tenure.rb
Unescape View File

@ -10,13 +10,13 @@ class Form::Sales::Questions::Buyer1PreviousTenure < ::Form::Question
def answer_options
{
"1" => { "value" => "Local Authority" },
"1" => { "value" => "Local authority tenant" },
"2" => { "value" => "Private registered provider or housing association tenant" },
"3" => { "value" => "Private tenant" },
"5" => { "value" => "Owner occupier" },
"4" => { "value" => "Tied home or renting with job" },
"6" => { "value" => "Living with family or friends" },
"7" => { "value" => "Temporary accomodation" },
"7" => { "value" => "Temporary accommodation" },
"9" => { "value" => "Other" },
"0" => { "value" => "Don’t know" },
}

4
app/models/form/sales/questions/previous_tenure_buyer2.rb
Unescape View File

@ -10,13 +10,13 @@ class Form::Sales::Questions::PreviousTenureBuyer2 < ::Form::Question
end
ANSWER_OPTIONS = {
"1" => { "value" => "Local Authority" },
"1" => { "value" => "Local authority tenant" },
"2" => { "value" => "Private registered provider or housing association tenant" },
"3" => { "value" => "Private tenant" },
"5" => { "value" => "Owner occupier" },
"4" => { "value" => "Tied home or renting with job" },
"6" => { "value" => "Living with family or friends" },
"7" => { "value" => "Temporary accomodation" },
"7" => { "value" => "Temporary accommodation" },
"9" => { "value" => "Other" },
"0" => { "value" => "Don't know" },
}.freeze

4
spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb
Unescape View File

@ -32,13 +32,13 @@ RSpec.describe Form::Sales::Questions::Buyer1PreviousTenure, type: :model do
it "has the correct answer_options" do
expect(question.answer_options).to eq({
"1" => { "value" => "Local Authority" },
"1" => { "value" => "Local authority tenant" },
"2" => { "value" => "Private registered provider or housing association tenant" },
"3" => { "value" => "Private tenant" },
"4" => { "value" => "Tied home or renting with job" },
"5" => { "value" => "Owner occupier" },
"6" => { "value" => "Living with family or friends" },
"7" => { "value" => "Temporary accomodation" },
"7" => { "value" => "Temporary accommodation" },
"9" => { "value" => "Other" },
"0" => { "value" => "Don’t know" },
})

4
spec/models/form/sales/questions/previous_tenure_buyer2_spec.rb
Unescape View File

@ -35,13 +35,13 @@ RSpec.describe Form::Sales::Questions::PreviousTenureBuyer2, type: :model do
it "has the correct answer_options" do
expect(question.answer_options).to eq({
"1" => { "value" => "Local Authority" },
"1" => { "value" => "Local authority tenant" },
"2" => { "value" => "Private registered provider or housing association tenant" },
"3" => { "value" => "Private tenant" },
"5" => { "value" => "Owner occupier" },
"4" => { "value" => "Tied home or renting with job" },
"6" => { "value" => "Living with family or friends" },
"7" => { "value" => "Temporary accomodation" },
"7" => { "value" => "Temporary accommodation" },
"9" => { "value" => "Other" },
"0" => { "value" => "Don't know" },
})

Write Preview
Loading…
Cancel
Save