From 57a72ebbb1445dd4c5dda25b6afcd678a69319b7 Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Fri, 4 Apr 2025 09:07:50 +0100 Subject: [PATCH] Update text copy to use 'Other' for consistency in instead of 'other' --- app/services/bulk_upload/sales/year2023/row_parser.rb | 8 ++++---- app/services/bulk_upload/sales/year2024/row_parser.rb | 6 +++--- spec/fixtures/files/2022_23_sales_bulk_upload.csv | 8 ++++---- spec/fixtures/files/blank_bulk_upload_sales.csv | 8 ++++---- .../bulk_upload/lettings/year2024/row_parser_spec.rb | 4 ++-- .../bulk_upload/lettings/year2025/row_parser_spec.rb | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/services/bulk_upload/sales/year2023/row_parser.rb b/app/services/bulk_upload/sales/year2023/row_parser.rb index 3770fc4d9..ddcf18b6a 100644 --- a/app/services/bulk_upload/sales/year2023/row_parser.rb +++ b/app/services/bulk_upload/sales/year2023/row_parser.rb @@ -16,7 +16,7 @@ class BulkUpload::Sales::Year2023::RowParser field_9: "What is the type of discounted ownership sale?", field_10: "What is the type of outright sale?", - field_11: "If 'other', what is the 'other' type?", + field_11: "If 'Other', what is the 'Other' type?", field_12: "Is the buyer a company?", field_13: "Will the buyers live in the property?", field_14: "Is this a joint purchase?", @@ -122,7 +122,7 @@ class BulkUpload::Sales::Year2023::RowParser field_105: "Was a mortgage used for the purchase of this property? - Shared ownership", field_106: "What is the mortgage amount?", field_107: "What is the name of the mortgage lender? - Shared ownership", - field_108: "If 'other', what is the name of the mortgage lender?", + field_108: "If 'Other', what is the name of the mortgage lender?", field_109: "What is the length of the mortgage in years? - Shared ownership", field_110: "Does this include any extra borrowing?", @@ -138,7 +138,7 @@ class BulkUpload::Sales::Year2023::RowParser field_120: "What is the mortgage amount?", field_121: "What is the name of the mortgage lender? - Discounted ownership", - field_122: "If 'other', what is the name of the mortgage lender?", + field_122: "If 'Other', what is the name of the mortgage lender?", field_123: "What is the length of the mortgage in years? - Discounted ownership", field_124: "Does this include any extra borrowing?", field_125: "How much was the cash deposit paid on the property?", @@ -148,7 +148,7 @@ class BulkUpload::Sales::Year2023::RowParser field_129: "What is the mortgage amount?", field_130: "What is the name of the mortgage lender? - Outright sale", - field_131: "If 'other', what is the name of the mortgage lender?", + field_131: "If 'Other', what is the name of the mortgage lender?", field_132: "What is the length of the mortgage in years? - Outright sale", field_133: "Does this include any extra borrowing?", field_134: "How much was the cash deposit paid on the property?", diff --git a/app/services/bulk_upload/sales/year2024/row_parser.rb b/app/services/bulk_upload/sales/year2024/row_parser.rb index c5347dd3c..a1b214182 100644 --- a/app/services/bulk_upload/sales/year2024/row_parser.rb +++ b/app/services/bulk_upload/sales/year2024/row_parser.rb @@ -17,7 +17,7 @@ class BulkUpload::Sales::Year2024::RowParser field_10: "What is the type of discounted ownership sale?", field_11: "What is the type of outright sale?", - field_12: "If 'other', what is the 'other' type?", + field_12: "If 'Other', what is the 'Other' type?", field_13: "Is the buyer a company?", field_14: "Will the buyers live in the property?", field_15: "Is this a joint purchase?", @@ -120,7 +120,7 @@ class BulkUpload::Sales::Year2024::RowParser field_103: "Was a mortgage used for the purchase of this property? - Shared ownership", field_104: "What is the mortgage amount?", field_105: "What is the name of the mortgage lender? - Shared ownership", - field_106: "If 'other', what is the name of the mortgage lender?", + field_106: "If 'Other', what is the name of the mortgage lender?", field_107: "What is the length of the mortgage in years? - Shared ownership", field_108: "Does this include any extra borrowing?", @@ -136,7 +136,7 @@ class BulkUpload::Sales::Year2024::RowParser field_118: "What is the mortgage amount?", field_119: "What is the name of the mortgage lender? - Discounted ownership", - field_120: "If 'other', what is the name of the mortgage lender?", + field_120: "If 'Other', what is the name of the mortgage lender?", field_121: "What is the length of the mortgage in years? - Discounted ownership", field_122: "Does this include any extra borrowing?", field_123: "How much was the cash deposit paid on the property?", diff --git a/spec/fixtures/files/2022_23_sales_bulk_upload.csv b/spec/fixtures/files/2022_23_sales_bulk_upload.csv index cf263ad1f..0d8bbbf8c 100644 --- a/spec/fixtures/files/2022_23_sales_bulk_upload.csv +++ b/spec/fixtures/files/2022_23_sales_bulk_upload.csv @@ -50,7 +50,7 @@ Discounted ownership","How much was the cash deposit paid on the property? Discounted ownership","What are the total monthly leasehold charges for the property? -Discounted ownership",What is the type of outright sale?,"What is the 'other' type of outright sale? +Discounted ownership",What is the type of outright sale?,"What is the 'Other' type of outright sale? Outright sale",[BLANK],"What is the full purchase price? @@ -66,15 +66,15 @@ Outright sale","Which organisation owned this property before the sale? Organisation's CORE ID",Username,BLANK,Has the buyer ever served in the UK Armed Forces and for how long?,[BLANK],Are any of the buyers a spouse or civil partner of a UK Armed Forces regular who died in service within the last 2 years?,"What is the name of the mortgage lender? -Shared ownership","What is the name of the 'other' mortgage lender? +Shared ownership","What is the name of the 'Other' mortgage lender? Shared ownership","What is the name of the mortgage lender? -Discounted ownership","What is the name of the 'other' mortgage lender? +Discounted ownership","What is the name of the 'Other' mortgage lender? Discounted ownership","What is the name of the mortgage lender? -Outright sale","What is the name of the 'other' mortgage lender? +Outright sale","What is the name of the 'Other' mortgage lender? Outright sale",Were the buyers receiving any of these housing-related benefits immediately before buying this property?,"What is the length of the mortgage in years? diff --git a/spec/fixtures/files/blank_bulk_upload_sales.csv b/spec/fixtures/files/blank_bulk_upload_sales.csv index d7245840c..249b966b1 100644 --- a/spec/fixtures/files/blank_bulk_upload_sales.csv +++ b/spec/fixtures/files/blank_bulk_upload_sales.csv @@ -50,7 +50,7 @@ Discounted ownership","How much was the cash deposit paid on the property? Discounted ownership","What are the total monthly leasehold charges for the property? -Discounted ownership",What is the type of outright sale?,"What is the 'other' type of outright sale? +Discounted ownership",What is the type of outright sale?,"What is the 'Other' type of outright sale? Outright sale",[BLANK],"What is the full purchase price? @@ -66,15 +66,15 @@ Outright sale","Which organisation owned this property before the sale? Organisation's CORE ID",Username,BLANK,Has the buyer ever served in the UK Armed Forces and for how long?,[BLANK],Are any of the buyers a spouse or civil partner of a UK Armed Forces regular who died in service within the last 2 years?,"What is the name of the mortgage lender? -Shared ownership","What is the name of the 'other' mortgage lender? +Shared ownership","What is the name of the 'Other' mortgage lender? Shared ownership","What is the name of the mortgage lender? -Discounted ownership","What is the name of the 'other' mortgage lender? +Discounted ownership","What is the name of the 'Other' mortgage lender? Discounted ownership","What is the name of the mortgage lender? -Outright sale","What is the name of the 'other' mortgage lender? +Outright sale","What is the name of the 'Other' mortgage lender? Outright sale",Were the buyers receiving any of these housing-related benefits immediately before buying this property?,"What is the length of the mortgage in years? 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 3aa51c51d..e051cc447 100644 --- a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb @@ -2635,7 +2635,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do end describe "#reasonother" do - context "when reason is 'other'" do + context "when reason is 'Other'" do let(:attributes) { { bulk_upload:, field_98: "20", field_99: "some other reason" } } it "is set to given free text string" do @@ -2643,7 +2643,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do end end - context "when reason is not 'other'" do + context "when reason is not 'Other'" do let(:attributes) { { bulk_upload:, field_98: "50", field_99: "some other reason" } } it "is set to nil" do diff --git a/spec/services/bulk_upload/lettings/year2025/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2025/row_parser_spec.rb index 4d31add2b..2692c05ac 100644 --- a/spec/services/bulk_upload/lettings/year2025/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2025/row_parser_spec.rb @@ -2408,7 +2408,7 @@ RSpec.describe BulkUpload::Lettings::Year2025::RowParser do end describe "#reasonother" do - context "when reason is 'other'" do + context "when reason is 'Other'" do let(:attributes) { { bulk_upload:, field_98: "20", field_99: "some other reason" } } it "is set to given free text string" do @@ -2416,7 +2416,7 @@ RSpec.describe BulkUpload::Lettings::Year2025::RowParser do end end - context "when reason is not 'other'" do + context "when reason is not 'Other'" do let(:attributes) { { bulk_upload:, field_98: "50", field_99: "some other reason" } } it "is set to nil" do