- <%= govuk_button_link_to "Invite user", new_user_path, html: { method: :get } %>
+ <% display_actions = current_user.data_coordinator? || current_user.support? %>
+
">
+ <% if display_actions %>
+ <%= govuk_button_link_to "Invite user", new_user_path, html: { method: :get } %>
+ <% end %>
<%= render SearchComponent.new(current_user:, search_label: "Search by name or email address", value: @searched) %>
diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index 6ebc090b6..ac615b0e2 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -7411,10 +7411,10 @@
}
],
"title_text": {
- "translation": "soft_validations.net_income.title_text"
+ "translation": "forms.2024.lettings.soft_validations.net_income_value_check.title_text"
},
"informative_text": {
- "translation": "soft_validations.net_income.hint_text",
+ "translation": "forms.2024.lettings.soft_validations.net_income_value_check.informative_text",
"arguments": [
{
"key": "ecstat1",
diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json
index 54cd67fd4..7d6f44b20 100644
--- a/config/forms/2022_2023.json
+++ b/config/forms/2022_2023.json
@@ -7870,7 +7870,7 @@
}
],
"title_text": {
- "translation": "soft_validations.net_income.title_text",
+ "translation": "forms.2024.lettings.soft_validations.net_income_value_check.title_text",
"arguments": [
{
"key": "incfreq",
@@ -7885,7 +7885,7 @@
]
},
"informative_text": {
- "translation": "soft_validations.net_income.hint_text",
+ "translation": "forms.2024.lettings.soft_validations.net_income_value_check.informative_text",
"arguments": [
{
"key": "net_income_higher_or_lower_text",
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 81c94b8c4..55044b7a6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -553,17 +553,6 @@ en:
organisation_not_selected: "Select an organisation from the search list."
soft_validations:
- net_income:
- title_text: "You told us that the household’s income is %{earnings} %{incfreq}."
- hint_text: "This is %{net_income_higher_or_lower_text} than we would expect for the household’s working situation."
- in_soft_min_range:
- message: "Net income is lower than expected based on the household’s working situation. Are you sure this is correct?"
- in_soft_max_range:
- message: "Net income is higher than expected based on the household’s working situation. Are you sure this is correct?"
- rent:
- outside_range_title: "You told us the rent is %{brent}."
- informative_text: "This is %{higher_or_lower} than we would expect."
- hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the rent type is correct, for example affordable or social rent
"
retirement:
min:
title: "You told us this person is aged %{age} years and retired."
@@ -571,40 +560,6 @@ en:
max:
title: "You told us this person is over 66 and not retired."
hint_text: "The minimum expected retirement age in England is 66."
- pregnancy:
- title: "You told us somebody in the household is pregnant."
- all_male_tenants: "You also told us that all the tenants living at the property are male."
- females_not_in_soft_age_range: "You also told us that any female tenants living at the property are in the following age ranges:
- under 16 years old
- over 50 years old
"
- major_repairs_date:
- title_text: "You told us the property has been vacant for 2 years."
- hint_text: "This is higher than we would expect."
- void_date:
- title_text: "You told us that the property has been vacant for more than 2 years."
- hint_text: "This is higher than we would expect."
- referral:
- title_text: "Are you sure?"
- hint_text: "This is a general needs log, and this referral type is for supported housing."
- scharge:
- over_soft_max_title: "You told us the service charge is %{scharge}."
- pscharge:
- over_soft_max_title: "You told us the personal service charge is %{pscharge}."
- supcharg:
- over_soft_max_title: "You told us the support charge is %{supcharg}."
- charges:
- informative_text: "This is higher than we would expect."
- hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
- reasonother:
- title_text: "You told us that the tenant’s main reason for leaving their last settled home was %{reasonother}."
- informative_text: "The reason you have entered looks very similar to one of the existing response categories.
- Please check the categories and select the appropriate one.
- If the existing categories are not suitable, please confirm here to move onto the next question."
- saledate:
- must_be_less_than_3_years_from_hodate: "You told us sale completion date is more than 3 years after practical completion or handover date."
- partner_under_16_lettings:
- title: "You told us this person is aged %{age} years and has 'Partner' relationship to the lead tenant."
- multiple_partners_lettings:
- title: "You told us there are more than 1 persons with 'Partner' relationship to the lead tenant."
-
devise:
two_factor_authentication:
success: "Two-factor authentication successful."
diff --git a/config/locales/forms/2023/lettings/soft_validations.en.yml b/config/locales/forms/2023/lettings/soft_validations.en.yml
new file mode 100644
index 000000000..d0354f127
--- /dev/null
+++ b/config/locales/forms/2023/lettings/soft_validations.en.yml
@@ -0,0 +1,132 @@
+en:
+ forms:
+ 2023:
+ lettings:
+ soft_validations:
+ pregnancy_value_check:
+ no_females_pregnant_household_value_check:
+ page_header: ""
+ check_answer_label: "Pregnancy confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us somebody in the household is pregnant."
+ informative_text: "You also told us that all the tenants living at the property are male."
+ females_in_soft_age_range_in_pregnant_household_value_check:
+ page_header: ""
+ check_answer_label: "Pregnancy confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us somebody in the household is pregnant."
+ informative_text: "You also told us that any female tenants living at the property are in the following age ranges:
- under 16 years old
- over 50 years old
"
+
+ no_retirement_value_check:
+ page_header: ""
+ check_answer_label: "Retirement confirmation"
+ hint_text: ""
+ question_text: "Are you sure this person is retired?"
+ title_text: "You told us this person is aged %{age} years and retired."
+ informative_text: "The minimum expected retirement age in England is 66."
+
+ retirement_value_check:
+ page_header: ""
+ check_answer_label: "Retirement confirmation"
+ hint_text: ""
+ question_text: "Are you sure this person isn’t retired?"
+ title_text: "You told us this person is over 66 and not retired."
+ informative_text: ""
+
+ partner_under_16_value_check:
+ page_header: ""
+ check_answer_label: "Partner under 16 confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us this person is aged %{age} years and has 'Partner' relationship to the lead tenant."
+ informative_text: "Are you sure this is correct?"
+
+ multiple_partners_value_check:
+ page_header: ""
+ check_answer_label: "Multiple partners confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us there are more than 1 persons with 'Partner' relationship to the lead tenant."
+ informative_text: "Are you sure this is correct?"
+
+ reasonother_value_check:
+ page_header: ""
+ check_answer_label: "Reason other confirmation"
+ hint_text: ""
+ question_text: "Are you sure this doesn’t fit an existing category?"
+ title_text: "You told us that the tenant’s main reason for leaving their last settled home was %{reasonother}."
+ informative_text: "The reason you have entered looks very similar to one of the existing response categories. Please check the categories and select the appropriate one. If the existing categories are not suitable, please confirm here to move onto the next question."
+
+ referral_value_check:
+ page_header: ""
+ check_answer_label: "Referral confirmation"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "Are you sure?"
+ informative_text: "This is a general needs log, and this referral type is for supported housing."
+
+ net_income_value_check:
+ page_header: ""
+ check_answer_label: "Net income confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that the household’s income is %{earnings} %{incfreq}."
+ informative_text: "This is %{net_income_higher_or_lower_text} than we would expect for the household’s working situation."
+
+ care_home_charges_value_check:
+ page_header: ""
+ check_answer_label: "Care home charges confirmation"
+ hint_text: ""
+ question_text: "Are you sure there are no care home charges?"
+ title_text: "Care home charges should be provided if this is a care home accommodation."
+ informative_text: "Are you sure there are no care home charges?"
+
+ rent_value_check:
+ page_header: ""
+ check_answer_label: "Total rent confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the rent type is correct, for example affordable or social rent
"
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us the rent is %{brent}."
+ informative_text: "This is %{higher_or_lower} than we would expect."
+
+ scharge_value_check:
+ page_header: ""
+ check_answer_label: "Service charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the service charge is %{scharge}."
+ informative_text: "This is higher than we would expect."
+
+ pscharge_value_check:
+ page_header: ""
+ check_answer_label: "Personal service charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the personal service charge is %{pscharge}."
+ informative_text: "This is higher than we would expect."
+
+ supcharg_value_check:
+ page_header: ""
+ check_answer_label: "Support charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the support charge is %{supcharg}."
+ informative_text: "This is higher than we would expect."
+
+ void_date_value_check:
+ page_header: ""
+ check_answer_label: "Void date confirmation"
+ hint_text: ""
+ question_text: "Are you sure the property has been vacant for this long?"
+ title_text: "You told us that the property has been vacant for more than 2 years."
+ informative_text: "This is higher than we would expect."
+
+ major_repairs_date_value_check:
+ page_header: ""
+ check_answer_label: "Major repairs date confirmation"
+ hint_text: ""
+ question_text: "Are you sure the property has been vacant for this long?"
+ title_text: "You told us the property has been vacant for 2 years."
+ informative_text: "This is higher than we would expect."
diff --git a/config/locales/forms/2024/lettings/soft_validations.en.yml b/config/locales/forms/2024/lettings/soft_validations.en.yml
new file mode 100644
index 000000000..ada093d39
--- /dev/null
+++ b/config/locales/forms/2024/lettings/soft_validations.en.yml
@@ -0,0 +1,132 @@
+en:
+ forms:
+ 2024:
+ lettings:
+ soft_validations:
+ pregnancy_value_check:
+ no_females_pregnant_household_value_check:
+ page_header: ""
+ check_answer_label: "Pregnancy confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us somebody in the household is pregnant."
+ informative_text: "You also told us that all the tenants living at the property are male."
+ females_in_soft_age_range_in_pregnant_household_value_check:
+ page_header: ""
+ check_answer_label: "Pregnancy confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us somebody in the household is pregnant."
+ informative_text: "You also told us that any female tenants living at the property are in the following age ranges:
- under 16 years old
- over 50 years old
"
+
+ no_retirement_value_check:
+ page_header: ""
+ check_answer_label: "Retirement confirmation"
+ hint_text: ""
+ question_text: "Are you sure this person is retired?"
+ title_text: "You told us this person is aged %{age} years and retired."
+ informative_text: "The minimum expected retirement age in England is 66."
+
+ retirement_value_check:
+ page_header: ""
+ check_answer_label: "Retirement confirmation"
+ hint_text: ""
+ question_text: "Are you sure this person isn’t retired?"
+ title_text: "You told us this person is over 66 and not retired."
+ informative_text: "Are you sure this person isn’t retired?"
+
+ partner_under_16_value_check:
+ page_header: ""
+ check_answer_label: "Partner under 16 confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us this person is aged %{age} years and has 'Partner' relationship to the lead tenant."
+ informative_text: "Are you sure this is correct?"
+
+ multiple_partners_value_check:
+ page_header: ""
+ check_answer_label: "Multiple partners confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us there are more than 1 persons with 'Partner' relationship to the lead tenant."
+ informative_text: "Are you sure this is correct?"
+
+ reasonother_value_check:
+ page_header: ""
+ check_answer_label: "Reason other confirmation"
+ hint_text: ""
+ question_text: "Are you sure this doesn’t fit an existing category?"
+ title_text: "You told us that the tenant’s main reason for leaving their last settled home was %{reasonother}."
+ informative_text: "The reason you have entered looks very similar to one of the existing response categories. Please check the categories and select the appropriate one. If the existing categories are not suitable, please confirm here to move onto the next question."
+
+ referral_value_check:
+ page_header: ""
+ check_answer_label: "Referral confirmation"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "Are you sure?"
+ informative_text: "This is a general needs log, and this referral type is for supported housing."
+
+ net_income_value_check:
+ page_header: ""
+ check_answer_label: "Net income confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that the household’s income is %{earnings} %{incfreq}."
+ informative_text: "This is %{net_income_higher_or_lower_text} than we would expect for the household’s working situation."
+
+ care_home_charges_value_check:
+ page_header: ""
+ check_answer_label: "Care home charges confirmation"
+ hint_text: ""
+ question_text: "Are you sure there are no care home charges?"
+ title_text: "Care home charges should be provided if this is a care home accommodation."
+ informative_text: "Are you sure there are no care home charges?"
+
+ rent_value_check:
+ page_header: ""
+ check_answer_label: "Total rent confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the rent type is correct, for example affordable or social rent
"
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us the rent is %{brent}."
+ informative_text: "This is %{higher_or_lower} than we would expect."
+
+ scharge_value_check:
+ page_header: ""
+ check_answer_label: "Service charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the service charge is %{scharge}."
+ informative_text: "This is higher than we would expect."
+
+ pscharge_value_check:
+ page_header: ""
+ check_answer_label: "Personal service charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the personal service charge is %{pscharge}."
+ informative_text: "This is higher than we would expect."
+
+ supcharg_value_check:
+ page_header: ""
+ check_answer_label: "Support charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the support charge is %{supcharg}."
+ informative_text: "This is higher than we would expect."
+
+ void_date_value_check:
+ page_header: ""
+ check_answer_label: "Void date confirmation"
+ hint_text: ""
+ question_text: "Are you sure the property has been vacant for this long?"
+ title_text: "You told us that the property has been vacant for more than 2 years."
+ informative_text: "This is longer than we would expect."
+
+ major_repairs_date_value_check:
+ page_header: ""
+ check_answer_label: "Major repairs date confirmation"
+ hint_text: ""
+ question_text: "Are you sure the property has been vacant for this long?"
+ title_text: "You told us the property has been vacant for 2 years."
+ informative_text: "This is longer than we would expect."
diff --git a/config/locales/forms/2025/lettings/soft_validations.en.yml b/config/locales/forms/2025/lettings/soft_validations.en.yml
new file mode 100644
index 000000000..03a3cbb3d
--- /dev/null
+++ b/config/locales/forms/2025/lettings/soft_validations.en.yml
@@ -0,0 +1,132 @@
+en:
+ forms:
+ 2025:
+ lettings:
+ soft_validations:
+ pregnancy_value_check:
+ no_females_pregnant_household_value_check:
+ page_header: ""
+ check_answer_label: "Pregnancy confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us somebody in the household is pregnant."
+ informative_text: "You also told us that all the tenants living at the property are male."
+ females_in_soft_age_range_in_pregnant_household_value_check:
+ page_header: ""
+ check_answer_label: "Pregnancy confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us somebody in the household is pregnant."
+ informative_text: "You also told us that any female tenants living at the property are in the following age ranges:
- under 16 years old
- over 50 years old
"
+
+ no_retirement_value_check:
+ page_header: ""
+ check_answer_label: "Retirement confirmation"
+ hint_text: ""
+ question_text: "Are you sure this person is retired?"
+ title_text: "You told us this person is aged %{age} years and retired."
+ informative_text: "The minimum expected retirement age in England is 66."
+
+ retirement_value_check:
+ page_header: ""
+ check_answer_label: "Retirement confirmation"
+ hint_text: ""
+ question_text: "Are you sure this person isn’t retired?"
+ title_text: "You told us this person is over 66 and not retired."
+ informative_text: "Are you sure this person isn’t retired?"
+
+ partner_under_16_value_check:
+ page_header: ""
+ check_answer_label: "Partner under 16 confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us this person is aged %{age} years and has 'Partner' relationship to the lead tenant."
+ informative_text: "Are you sure this is correct?"
+
+ multiple_partners_value_check:
+ page_header: ""
+ check_answer_label: "Multiple partners confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us there are more than 1 persons with 'Partner' relationship to the lead tenant."
+ informative_text: "Are you sure this is correct?"
+
+ reasonother_value_check:
+ page_header: ""
+ check_answer_label: "Reason other confirmation"
+ hint_text: ""
+ question_text: "Are you sure this doesn’t fit an existing category?"
+ title_text: "You told us that the tenant’s main reason for leaving their last settled home was %{reasonother}."
+ informative_text: "The reason you have entered looks very similar to one of the existing response categories. Please check the categories and select the appropriate one. If the existing categories are not suitable, please confirm here to move onto the next question."
+
+ referral_value_check:
+ page_header: ""
+ check_answer_label: "Referral confirmation"
+ hint_text: ""
+ question_text: "Are you sure?"
+ title_text: "Are you sure?"
+ informative_text: "This is a general needs log, and this referral type is for supported housing."
+
+ net_income_value_check:
+ page_header: ""
+ check_answer_label: "Net income confirmation"
+ hint_text: ""
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us that the household’s income is %{earnings} %{incfreq}."
+ informative_text: "This is %{net_income_higher_or_lower_text} than we would expect for the household’s working situation."
+
+ care_home_charges_value_check:
+ page_header: ""
+ check_answer_label: "Care home charges confirmation"
+ hint_text: ""
+ question_text: "Are you sure there are no care home charges?"
+ title_text: "Care home charges should be provided if this is a care home accommodation."
+ informative_text: "Are you sure there are no care home charges?"
+
+ rent_value_check:
+ page_header: ""
+ check_answer_label: "Total rent confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the rent type is correct, for example affordable or social rent
"
+ question_text: "Are you sure this is correct?"
+ title_text: "You told us the rent is %{brent}."
+ informative_text: "This is %{higher_or_lower} than we would expect."
+
+ scharge_value_check:
+ page_header: ""
+ check_answer_label: "Service charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the service charge is %{scharge}."
+ informative_text: "This is higher than we would expect."
+
+ pscharge_value_check:
+ page_header: ""
+ check_answer_label: "Personal service charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the personal service charge is %{pscharge}."
+ informative_text: "This is higher than we would expect."
+
+ supcharg_value_check:
+ page_header: ""
+ check_answer_label: "Support charge confirmation"
+ hint_text: "Check the following:
- the decimal point
- the frequency, for example every week or every calendar month
- the needs type
"
+ question_text: "Are you sure?"
+ title_text: "You told us the support charge is %{supcharg}."
+ informative_text: "This is higher than we would expect."
+
+ void_date_value_check:
+ page_header: ""
+ check_answer_label: "Void date confirmation"
+ hint_text: ""
+ question_text: "Are you sure the property has been vacant for this long?"
+ title_text: "You told us that the property has been vacant for more than 2 years."
+ informative_text: "This is longer than we would expect."
+
+ major_repairs_date_value_check:
+ page_header: ""
+ check_answer_label: "Major repairs date confirmation"
+ hint_text: ""
+ question_text: "Are you sure the property has been vacant for this long?"
+ title_text: "You told us the property has been vacant for 2 years."
+ informative_text: "This is longer than we would expect."
diff --git a/spec/fixtures/forms/2021_2022.json b/spec/fixtures/forms/2021_2022.json
index 3159459ad..cb0aaf06e 100644
--- a/spec/fixtures/forms/2021_2022.json
+++ b/spec/fixtures/forms/2021_2022.json
@@ -740,7 +740,7 @@
}
],
"title_text": {
- "translation": "soft_validations.net_income.title_text",
+ "translation": "forms.2024.lettings.soft_validations.net_income_value_check.title_text",
"arguments": [
{
"key": "incfreq",
@@ -755,7 +755,7 @@
]
},
"informative_text": {
- "translation": "soft_validations.net_income.hint_text",
+ "translation": "forms.2024.lettings.soft_validations.net_income_value_check.informative_text",
"arguments": [
{
"key": "net_income_higher_or_lower_text",
diff --git a/spec/helpers/interruption_screen_helper_spec.rb b/spec/helpers/interruption_screen_helper_spec.rb
index 60cd71131..0d4456f2a 100644
--- a/spec/helpers/interruption_screen_helper_spec.rb
+++ b/spec/helpers/interruption_screen_helper_spec.rb
@@ -93,7 +93,7 @@ RSpec.describe InterruptionScreenHelper do
context "when 1 out of 2 arguments are given" do
it "returns an empty string" do
informative_text = {
- "translation" => "soft_validations.net_income.hint_text",
+ "translation" => "forms.2024.lettings.soft_validations.net_income_value_check.informative_text",
"arguments" => [
{
"key" => "ecstat1",
diff --git a/spec/models/form/lettings/pages/care_home_charges_value_check_spec.rb b/spec/models/form/lettings/pages/care_home_charges_value_check_spec.rb
index 0530cf445..e9c1d5879 100644
--- a/spec/models/form/lettings/pages/care_home_charges_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/care_home_charges_value_check_spec.rb
@@ -30,12 +30,12 @@ RSpec.describe Form::Lettings::Pages::CareHomeChargesValueCheck, type: :model do
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.care_home_charges.title_text",
+ "translation" => "forms.2024.lettings.soft_validations.care_home_charges_value_check.title_text",
})
end
it "has the correct informative_text" do
- expect(page.informative_text).to eq("")
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.care_home_charges_value_check.informative_text" })
end
it "has the correct interruption_screen_question_ids" do
diff --git a/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check_spec.rb b/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check_spec.rb
index 0b3d770b3..865fc6fd2 100644
--- a/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check_spec.rb
@@ -37,27 +37,15 @@ RSpec.describe Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPe
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.pregnancy.title",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check.title_text",
+ "arguments" => [],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.pregnancy.females_not_in_soft_age_range",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check.informative_text",
+ "arguments" => [],
})
end
end
@@ -82,27 +70,15 @@ RSpec.describe Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPe
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.pregnancy.title",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check.title_text",
+ "arguments" => [],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.pregnancy.females_not_in_soft_age_range",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check.informative_text",
+ "arguments" => [],
})
end
end
diff --git a/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check_spec.rb b/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check_spec.rb
index f380a5cb9..8ce2e5451 100644
--- a/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check_spec.rb
@@ -37,27 +37,15 @@ RSpec.describe Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPe
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.pregnancy.title",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check.title_text",
+ "arguments" => [],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.pregnancy.females_not_in_soft_age_range",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check.informative_text",
+ "arguments" => [],
})
end
end
@@ -82,27 +70,15 @@ RSpec.describe Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPe
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.pregnancy.title",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check.title_text",
+ "arguments" => [],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.pregnancy.females_not_in_soft_age_range",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check.informative_text",
+ "arguments" => [],
})
end
end
diff --git a/spec/models/form/lettings/pages/multiple_partners_value_check_spec.rb b/spec/models/form/lettings/pages/multiple_partners_value_check_spec.rb
index 551a3b070..f116cb601 100644
--- a/spec/models/form/lettings/pages/multiple_partners_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/multiple_partners_value_check_spec.rb
@@ -4,7 +4,8 @@ RSpec.describe Form::Lettings::Pages::MultiplePartnersValueCheck, type: :model d
subject(:page) { described_class.new(page_id, page_definition, subsection, person_index:) }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
+ let(:subsection) { instance_double(Form::Subsection, form:) }
let(:person_index) { 1 }
let(:page_id) { "multiple_partners_value_check" }
@@ -39,13 +40,13 @@ RSpec.describe Form::Lettings::Pages::MultiplePartnersValueCheck, type: :model d
it "has correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.multiple_partners_lettings.title",
+ "translation" => "forms.2024.lettings.soft_validations.multiple_partners_value_check.title_text",
"arguments" => [],
})
end
it "has correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.multiple_partners_value_check.informative_text" })
end
it "has correct interruption_screen_question_ids" do
@@ -71,13 +72,13 @@ RSpec.describe Form::Lettings::Pages::MultiplePartnersValueCheck, type: :model d
it "has correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.multiple_partners_lettings.title",
+ "translation" => "forms.2024.lettings.soft_validations.multiple_partners_value_check.title_text",
"arguments" => [],
})
end
it "has correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.multiple_partners_value_check.informative_text" })
end
it "has correct interruption_screen_question_ids" do
diff --git a/spec/models/form/lettings/pages/net_income_value_check_spec.rb b/spec/models/form/lettings/pages/net_income_value_check_spec.rb
index 523e02c8b..fe98919ae 100644
--- a/spec/models/form/lettings/pages/net_income_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/net_income_value_check_spec.rb
@@ -24,13 +24,13 @@ RSpec.describe Form::Lettings::Pages::NetIncomeValueCheck, type: :model do
end
it "has the correct title_text" do
- expect(page.title_text).to eq({ "translation" => "soft_validations.net_income.title_text", "arguments" => [{ "i18n_template" => "incfreq", "key" => "incfreq", "label" => true }, { "arguments_for_key" => "earnings", "i18n_template" => "earnings", "key" => "field_formatted_as_currency" }] })
+ expect(page.title_text).to eq({ "translation" => "forms.2024.lettings.soft_validations.net_income_value_check.title_text", "arguments" => [{ "i18n_template" => "incfreq", "key" => "incfreq", "label" => true }, { "arguments_for_key" => "earnings", "i18n_template" => "earnings", "key" => "field_formatted_as_currency" }] })
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
"arguments" => [{ "i18n_template" => "net_income_higher_or_lower_text", "key" => "net_income_higher_or_lower_text", "label" => false }],
- "translation" => "soft_validations.net_income.hint_text",
+ "translation" => "forms.2024.lettings.soft_validations.net_income_value_check.informative_text",
})
end
end
diff --git a/spec/models/form/lettings/pages/no_females_pregnant_household_person_age_value_check_spec.rb b/spec/models/form/lettings/pages/no_females_pregnant_household_person_age_value_check_spec.rb
index 286ac6183..6cf6302f8 100644
--- a/spec/models/form/lettings/pages/no_females_pregnant_household_person_age_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/no_females_pregnant_household_person_age_value_check_spec.rb
@@ -37,27 +37,15 @@ RSpec.describe Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCh
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.pregnancy.title",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.no_females_pregnant_household_value_check.title_text",
+ "arguments" => [],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.pregnancy.all_male_tenants",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.no_females_pregnant_household_value_check.informative_text",
+ "arguments" => [],
})
end
end
@@ -82,27 +70,15 @@ RSpec.describe Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCh
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.pregnancy.title",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.no_females_pregnant_household_value_check.title_text",
+ "arguments" => [],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.pregnancy.all_male_tenants",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.no_females_pregnant_household_value_check.informative_text",
+ "arguments" => [],
})
end
end
diff --git a/spec/models/form/lettings/pages/no_females_pregnant_household_person_value_check_spec.rb b/spec/models/form/lettings/pages/no_females_pregnant_household_person_value_check_spec.rb
index 205f19ae1..f986f17d2 100644
--- a/spec/models/form/lettings/pages/no_females_pregnant_household_person_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/no_females_pregnant_household_person_value_check_spec.rb
@@ -37,27 +37,15 @@ RSpec.describe Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonValueCheck
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.pregnancy.title",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.no_females_pregnant_household_value_check.title_text",
+ "arguments" => [],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.pregnancy.all_male_tenants",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.no_females_pregnant_household_value_check.informative_text",
+ "arguments" => [],
})
end
end
@@ -82,27 +70,15 @@ RSpec.describe Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonValueCheck
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.pregnancy.title",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.no_females_pregnant_household_value_check.title_text",
+ "arguments" => [],
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.pregnancy.all_male_tenants",
- "arguments" => [
- {
- "key" => "sex1",
- "label" => true,
- "i18n_template" => "sex1",
- },
- ],
+ "translation" => "forms.2024.lettings.soft_validations.pregnancy_value_check.no_females_pregnant_household_value_check.informative_text",
+ "arguments" => [],
})
end
end
diff --git a/spec/models/form/lettings/pages/partner_under16_value_check_spec.rb b/spec/models/form/lettings/pages/partner_under16_value_check_spec.rb
index a769f95cc..168f4ca91 100644
--- a/spec/models/form/lettings/pages/partner_under16_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/partner_under16_value_check_spec.rb
@@ -4,7 +4,8 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
subject(:page) { described_class.new(page_id, page_definition, subsection, person_index:) }
let(:page_definition) { nil }
- let(:subsection) { instance_double(Form::Subsection) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
+ let(:subsection) { instance_double(Form::Subsection, form:) }
let(:person_index) { 1 }
let(:page_id) { "partner_under_16_value_check" }
@@ -39,7 +40,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
it "has correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.partner_under_16_lettings.title",
+ "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.title_text",
"arguments" => [
{
"key" => "age1",
@@ -51,7 +52,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
end
it "has correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.informative_text" })
end
it "has correct interruption_screen_question_ids" do
@@ -77,7 +78,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
it "has correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.partner_under_16_lettings.title",
+ "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.title_text",
"arguments" => [
{
"key" => "age2",
@@ -89,7 +90,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
end
it "has correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.informative_text" })
end
it "has correct interruption_screen_question_ids" do
@@ -115,7 +116,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
it "has correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.partner_under_16_lettings.title",
+ "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.title_text",
"arguments" => [
{
"key" => "age3",
@@ -127,7 +128,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
end
it "has correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.informative_text" })
end
it "has correct interruption_screen_question_ids" do
@@ -153,7 +154,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
it "has correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.partner_under_16_lettings.title",
+ "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.title_text",
"arguments" => [
{
"key" => "age4",
@@ -165,7 +166,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
end
it "has correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.informative_text" })
end
it "has correct interruption_screen_question_ids" do
@@ -191,7 +192,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
it "has correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.partner_under_16_lettings.title",
+ "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.title_text",
"arguments" => [
{
"key" => "age5",
@@ -203,7 +204,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
end
it "has correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.informative_text" })
end
it "has correct interruption_screen_question_ids" do
@@ -229,7 +230,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
it "has correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.partner_under_16_lettings.title",
+ "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.title_text",
"arguments" => [
{
"key" => "age6",
@@ -241,7 +242,7 @@ RSpec.describe Form::Lettings::Pages::PartnerUnder16ValueCheck, type: :model do
end
it "has correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.partner_under_16_value_check.informative_text" })
end
it "has correct interruption_screen_question_ids" do
diff --git a/spec/models/form/lettings/pages/person_over_retirement_value_check_spec.rb b/spec/models/form/lettings/pages/person_over_retirement_value_check_spec.rb
index ec00f0d75..c8a482ee4 100644
--- a/spec/models/form/lettings/pages/person_over_retirement_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/person_over_retirement_value_check_spec.rb
@@ -28,13 +28,14 @@ RSpec.describe Form::Lettings::Pages::PersonOverRetirementValueCheck, type: :mod
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.retirement.max.title",
+ "translation" => "forms.2024.lettings.soft_validations.retirement_value_check.title_text",
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.retirement.max.hint_text",
+ "translation" => "forms.2024.lettings.soft_validations.retirement_value_check.informative_text",
+ "arguments" => [],
})
end
end
@@ -50,13 +51,14 @@ RSpec.describe Form::Lettings::Pages::PersonOverRetirementValueCheck, type: :mod
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.retirement.max.title",
+ "translation" => "forms.2024.lettings.soft_validations.retirement_value_check.title_text",
})
end
it "has the correct informative_text" do
expect(page.informative_text).to eq({
- "translation" => "soft_validations.retirement.max.hint_text",
+ "translation" => "forms.2024.lettings.soft_validations.retirement_value_check.informative_text",
+ "arguments" => [],
})
end
end
diff --git a/spec/models/form/lettings/pages/person_under_retirement_value_check_spec.rb b/spec/models/form/lettings/pages/person_under_retirement_value_check_spec.rb
index 37ca94f9e..6226e0309 100644
--- a/spec/models/form/lettings/pages/person_under_retirement_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/person_under_retirement_value_check_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Pages::PersonUnderRetirementValueCheck, type: :mo
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.retirement.min.title",
+ "translation" => "forms.2024.lettings.soft_validations.no_retirement_value_check.title_text",
"arguments" => [
{
"key" => "age2",
@@ -40,7 +40,7 @@ RSpec.describe Form::Lettings::Pages::PersonUnderRetirementValueCheck, type: :mo
end
it "has the correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.no_retirement_value_check.informative_text" })
end
end
@@ -55,7 +55,7 @@ RSpec.describe Form::Lettings::Pages::PersonUnderRetirementValueCheck, type: :mo
it "has the correct title_text" do
expect(page.title_text).to eq({
- "translation" => "soft_validations.retirement.min.title",
+ "translation" => "forms.2024.lettings.soft_validations.no_retirement_value_check.title_text",
"arguments" => [
{
"key" => "age3",
@@ -67,7 +67,7 @@ RSpec.describe Form::Lettings::Pages::PersonUnderRetirementValueCheck, type: :mo
end
it "has the correct informative_text" do
- expect(page.informative_text).to eq({})
+ expect(page.informative_text).to eq({ "arguments" => [], "translation" => "forms.2024.lettings.soft_validations.no_retirement_value_check.informative_text" })
end
end
end
diff --git a/spec/models/form/lettings/subsections/household_characteristics_spec.rb b/spec/models/form/lettings/subsections/household_characteristics_spec.rb
index b97717077..b45f86fce 100644
--- a/spec/models/form/lettings/subsections/household_characteristics_spec.rb
+++ b/spec/models/form/lettings/subsections/household_characteristics_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdCharacteristics, type: :mod
let(:subsection_id) { nil }
let(:subsection_definition) { nil }
let(:section) { instance_double(Form::Lettings::Sections::Household) }
- let(:form) { instance_double(Form) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
before do
allow(section).to receive(:form).and_return(form)
diff --git a/spec/models/form/lettings/subsections/household_needs_spec.rb b/spec/models/form/lettings/subsections/household_needs_spec.rb
index 6e4dd25f1..dcd957601 100644
--- a/spec/models/form/lettings/subsections/household_needs_spec.rb
+++ b/spec/models/form/lettings/subsections/household_needs_spec.rb
@@ -5,7 +5,8 @@ RSpec.describe Form::Lettings::Subsections::HouseholdNeeds, type: :model do
let(:subsection_id) { nil }
let(:subsection_definition) { nil }
- let(:section) { instance_double(Form::Lettings::Sections::Household) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
+ let(:section) { instance_double(Form::Lettings::Sections::Household, form:) }
it "has correct section" do
expect(household_needs.section).to eq(section)
diff --git a/spec/models/form/lettings/subsections/household_situation_spec.rb b/spec/models/form/lettings/subsections/household_situation_spec.rb
index b9f65dbdd..d672b3ccc 100644
--- a/spec/models/form/lettings/subsections/household_situation_spec.rb
+++ b/spec/models/form/lettings/subsections/household_situation_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Form::Lettings::Subsections::HouseholdSituation, type: :model do
let(:subsection_id) { nil }
let(:subsection_definition) { nil }
let(:section) { instance_double(Form::Lettings::Sections::Household) }
- let(:form) { instance_double(Form) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
before do
allow(section).to receive(:form).and_return(form)
diff --git a/spec/models/form/lettings/subsections/income_and_benefits_spec.rb b/spec/models/form/lettings/subsections/income_and_benefits_spec.rb
index 4c92faaf6..7bdc26bfa 100644
--- a/spec/models/form/lettings/subsections/income_and_benefits_spec.rb
+++ b/spec/models/form/lettings/subsections/income_and_benefits_spec.rb
@@ -5,7 +5,8 @@ RSpec.describe Form::Lettings::Subsections::IncomeAndBenefits, type: :model do
let(:subsection_id) { nil }
let(:subsection_definition) { nil }
- let(:section) { instance_double(Form::Lettings::Sections::RentAndCharges) }
+ let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1)) }
+ let(:section) { instance_double(Form::Lettings::Sections::RentAndCharges, form:) }
it "has correct section" do
expect(income_and_benefits.section).to eq(section)
diff --git a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb
index 8161f8a00..591ffdd53 100644
--- a/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2023/row_parser_spec.rb
@@ -1851,8 +1851,8 @@ RSpec.describe BulkUpload::Lettings::Year2023::RowParser do
it "populates with correct error message" do
parser.valid?
- expect(parser.errors.where(:field_46, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired.")
- expect(parser.errors.where(:field_50, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired.")
+ expect(parser.errors.where(:field_46, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired. The minimum expected retirement age in England is 66.")
+ expect(parser.errors.where(:field_50, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired. The minimum expected retirement age in England is 66.")
end
end
diff --git a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
index e33458eb4..e9047b2ae 100644
--- a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
+++ b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb
@@ -1881,8 +1881,8 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
it "populates with correct error message" do
parser.valid?
- expect(parser.errors.where(:field_42, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired.")
- expect(parser.errors.where(:field_46, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired.")
+ expect(parser.errors.where(:field_42, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired. The minimum expected retirement age in England is 66.")
+ expect(parser.errors.where(:field_46, category: :soft_validation).first.message).to eql("You told us this person is aged 22 years and retired. The minimum expected retirement age in England is 66.")
end
end