diff --git a/spec/services/bulk_upload/sales/validator_spec.rb b/spec/services/bulk_upload/sales/validator_spec.rb index 557386cd2..6bd118344 100644 --- a/spec/services/bulk_upload/sales/validator_spec.rb +++ b/spec/services/bulk_upload/sales/validator_spec.rb @@ -63,8 +63,8 @@ RSpec.describe BulkUpload::Sales::Validator do let(:log) { build(:sales_log, :completed, saledate: Time.zone.local(2024, 10, 10), assigned_to: user) } before do - file.write(log_to_csv.default_2025_field_numbers_row) - file.write(log_to_csv.to_2025_csv_row) + file.write(log_to_csv.default_field_numbers_row_for_year(2025)) + file.write(log_to_csv.to_year_csv_row(2025)) file.rewind end diff --git a/spec/services/bulk_upload/sales/year2025/csv_parser_spec.rb b/spec/services/bulk_upload/sales/year2025/csv_parser_spec.rb index 7031b0dbe..2bb914af4 100644 --- a/spec/services/bulk_upload/sales/year2025/csv_parser_spec.rb +++ b/spec/services/bulk_upload/sales/year2025/csv_parser_spec.rb @@ -15,8 +15,8 @@ RSpec.describe BulkUpload::Sales::Year2025::CsvParser do file.write("Can be empty?\n") file.write("Type of letting the question applies to\n") file.write("Duplicate check field?\n") - file.write(BulkUpload::SalesLogToCsv.new(log:).default_2025_field_numbers_row) - file.write(BulkUpload::SalesLogToCsv.new(log:).to_2025_csv_row) + file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2025)) + file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2025)) file.write("\n") file.rewind end @@ -47,8 +47,8 @@ RSpec.describe BulkUpload::Sales::Year2025::CsvParser do file.write("\n") file.write("Type of letting the question applies to\n") file.write("Duplicate check field?\n") - file.write(BulkUpload::SalesLogToCsv.new(log:).default_2025_field_numbers_row) - file.write(BulkUpload::SalesLogToCsv.new(log:).to_2025_csv_row) + file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2025)) + file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2025)) file.write("\n") file.rewind end @@ -81,8 +81,8 @@ RSpec.describe BulkUpload::Sales::Year2025::CsvParser do file.write("Can be empty?\n") file.write("Type of letting the question applies to\n") file.write("Duplicate check field?\n") - file.write(BulkUpload::SalesLogToCsv.new(log:).default_2025_field_numbers_row(seed:)) - file.write(BulkUpload::SalesLogToCsv.new(log:).to_2025_csv_row(seed:)) + file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2025, seed:)) + file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2025, seed:)) file.rewind end @@ -102,7 +102,7 @@ RSpec.describe BulkUpload::Sales::Year2025::CsvParser do let(:log) { build(:sales_log, :completed, :with_uprn) } before do - file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_2025_csv_row) + file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_year_csv_row(2025)) file.rewind end @@ -124,7 +124,7 @@ RSpec.describe BulkUpload::Sales::Year2025::CsvParser do before do file.write(bom) - file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_2025_csv_row) + file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_year_csv_row(2025)) file.close end @@ -141,7 +141,7 @@ RSpec.describe BulkUpload::Sales::Year2025::CsvParser do before do file.write(invalid_sequence) - file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_2025_csv_row) + file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_year_csv_row(2025)) file.close end @@ -159,8 +159,8 @@ RSpec.describe BulkUpload::Sales::Year2025::CsvParser do file.write("Can be empty?\n") file.write("Type of letting the question applies to\n") file.write("Duplicate check field?\n") - file.write(BulkUpload::SalesLogToCsv.new(log:).default_2025_field_numbers_row) - file.write(BulkUpload::SalesLogToCsv.new(log:).to_2025_csv_row) + file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2025)) + file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2025)) file.rewind end @@ -179,8 +179,8 @@ RSpec.describe BulkUpload::Sales::Year2025::CsvParser do file.write("Can be empty?\r") file.write("Type of letting the question applies to\r\n") file.write("Duplicate check field?\r") - file.write(BulkUpload::SalesLogToCsv.new(log:).default_2025_field_numbers_row) - file.write(BulkUpload::SalesLogToCsv.new(log:).to_2025_csv_row) + file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2025)) + file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2025)) file.rewind end