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
3 years ago · 14289cbc8f
4 changed files with 8 additions and 8 deletions
--- a/app/models/form/sales/questions/buyer1_previous_tenure.rb
+++ b/app/models/form/sales/questions/buyer1_previous_tenure.rb
@ -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" },
    }
--- a/app/models/form/sales/questions/previous_tenure_buyer2.rb
+++ b/app/models/form/sales/questions/previous_tenure_buyer2.rb
@ -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
--- a/spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb
@ -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" },
    })
--- a/spec/models/form/sales/questions/previous_tenure_buyer2_spec.rb
+++ b/spec/models/form/sales/questions/previous_tenure_buyer2_spec.rb
@ -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" },
    })