update homeless and benefitcap questions

app/models/constants/case_log.rb

@@ -2,7 +2,7 @@ module Constants::CaseLog
   BENEFITCAP = {
     "Yes - benefit cap" => 5,
     "Yes - removal of the spare room subsidy" => 4,
-    "Yes - both the benefit cap and the removal of the spare room subsidy" => 6,
+    "Yes - both" => 6,
     "No" => 2,
     "Don’t know" => 3,
     "Prefer not to say" => 100,
@@ -57,8 +57,8 @@ module Constants::CaseLog
   }.freeze
 
   HOMELESS = {
-    "Yes - assessed as homeless by a local authority and owed a homelessness duty. Including if threatened with homelessness within 56 days" => 11,
+    "Assessed as homeless (or threatened with homelessness within 56 days) by a local authority and owed a homelessness duty" => 11,
-    "Yes - other homelessness" => 7,
+    "Other homeless - not found statutorily homeless but considered homeless by landlord" => 7,
     "No" => 1,
   }.freeze
 

config/forms/2021_2022.json

@@ -1304,37 +1304,9 @@
                   }
                 },
                 "other_reason_for_leaving_last_settled_home": {
-                  "header": "Please state the reason for leaving last settled home",
+                  "header": "What is the reason?",
                   "hint_text": "",
                   "type": "text"
-                },
-                "underoccupation_benefitcap": {
-                  "header": "Was the reason for leaving because of the benefit cap or removal of the spare room subsidy?",
-                  "hint_text": "",
-                  "type": "radio",
-                  "answer_options": {
-                    "0": {
-                      "value": "Yes - benefit cap"
-                    },
-                    "1": {
-                      "value": "Yes - removal of the spare room subsidy"
-                    },
-                    "2": {
-                      "value": "Yes - both the benefit cap and the removal of the spare room subsidy"
-                    },
-                    "3": {
-                      "value": "No"
-                    },
-                    "4": {
-                      "value": "Don’t know"
-                    },
-                    "5": {
-                      "value": "Prefer not to say"
-                    },
-                    "divider": {
-                      "value": true
-                    }
-                  }
                 }
               }
             },
@@ -1420,20 +1392,51 @@
                 }
               }
             },
+            "underoccupation_benefitcap": {
+              "header": "",
+              "description": "",
+              "questions": {
+                "underoccupation_benefitcap": {
+                  "header": "Was the reason for leaving a direct result of the removal of the spare room subsidy or benefit cap introduced from 2013?",
+                  "hint_text": "",
+                  "type": "radio",
+                  "answer_options": {
+                    "0": {
+                      "value": "Yes - removal of the spare room subsidy"
+                    },
+                    "1": {
+                      "value": "Yes - benefit cap"
+                    },
+                    "2": {
+                      "value": "Yes - both"
+                    },
+                    "3": {
+                      "value": "No"
+                    },
+                    "4": {
+                      "value": "Don’t know"
+                    },
+                    "divider": {
+                      "value": true
+                    }
+                  }
+                }
+              }
+            },
             "homelessness": {
               "header": "",
               "description": "",
               "questions": {
                 "homeless": {
-                  "header": "Did the tenant experience homelessness immediately before this letting?",
+                  "header": "Did the household experience homelessness immediately before this letting?",
                   "hint_text": "",
                   "type": "radio",
                   "answer_options": {
                     "0": {
-                      "value": "Yes - assessed as homeless by a local authority and owed a homelessness duty. Including if threatened with homelessness within 56 days"
+                      "value": "Assessed as homeless (or threatened with homelessness within 56 days) by a local authority and owed a homelessness duty"
                     },
                     "1": {
-                      "value": "Yes - other homelessness"
+                      "value": "Other homeless - not found statutorily homeless but considered homeless by landlord"
                     },
                     "2": {
                       "value": "No"

docs/api/DLUHC-CORE-Data.v1.json

@@ -771,7 +771,7 @@
             "enum": [
               "Yes - benefit cap",
               "Yes - removal of the spare room subsidy",
-              "Yes - both the benefit cap and the removal of the spare room subsidy",
+              "Yes - both",
               "No",
               "Don’t know",
               "Prefer not to say"

spec/factories/case_log.rb

@@ -47,7 +47,7 @@ FactoryBot.define do
       age2 { 32 }
       sex2 { "Male" }
       ecstat2 { "Not seeking work" }
-      homeless { "Yes - other homelessness" }
+      homeless { "Other homeless - not found statutorily homeless but considered homeless by landlord" }
       underoccupation_benefitcap { "No" }
       leftreg { "No - they left up to 5 years ago" }
       reservist { "No" }