From 2ce8fe7d9678760182139832f5346d1430b79d90 Mon Sep 17 00:00:00 2001 From: Rachael Booth Date: Wed, 17 Jul 2024 11:35:12 +0100 Subject: [PATCH] Use bulk_upload.year_combo for comparison in request tests to avoid year dependancy --- .../requests/bulk_upload_lettings_resume_controller_spec.rb | 6 +++--- ...pload_lettings_soft_validations_check_controller_spec.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/requests/bulk_upload_lettings_resume_controller_spec.rb b/spec/requests/bulk_upload_lettings_resume_controller_spec.rb index c91211d5a..d110768f0 100644 --- a/spec/requests/bulk_upload_lettings_resume_controller_spec.rb +++ b/spec/requests/bulk_upload_lettings_resume_controller_spec.rb @@ -41,7 +41,7 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do expect(response).to be_successful expect(response.body).to include("Bulk upload for lettings") - expect(response.body).to include("2023/24") + expect(response.body).to include(bulk_upload.year_combo) expect(response.body).to include("View the error report") expect(response.body).to include("How would you like to fix the errors?") expect(response.body).to include(bulk_upload.filename) @@ -180,7 +180,7 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do expect(response).to be_successful expect(response.body).to include("Bulk upload for lettings") - expect(response.body).to include("2023/24") + expect(response.body).to include(bulk_upload.year_combo) expect(response.body).to include("These 2 answers will be deleted if you upload the log") expect(response.body).to include(bulk_upload.filename) expect(response.body).to include("Clear this data and upload the logs") @@ -222,7 +222,7 @@ RSpec.describe BulkUploadLettingsResumeController, type: :request do expect(response).to be_successful expect(response.body).to include("Bulk upload for lettings") - expect(response.body).to include("2023/24") + expect(response.body).to include(bulk_upload.year_combo) expect(response.body).to include("These 2 answers will be deleted if you upload the log") expect(response.body).to include(bulk_upload.filename) expect(response.body).to include("Clear this data and upload the logs") diff --git a/spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb b/spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb index 88640dcb4..e7fc9ed46 100644 --- a/spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb +++ b/spec/requests/bulk_upload_lettings_soft_validations_check_controller_spec.rb @@ -15,7 +15,7 @@ RSpec.describe BulkUploadLettingsSoftValidationsCheckController, type: :request get "/lettings-logs/bulk-upload-soft-validations-check/#{bulk_upload.id}/confirm-soft-errors" expect(response.body).to include("Bulk upload for lettings") - expect(response.body).to include("2023/24") + expect(response.body).to include(bulk_upload.year_combo) expect(response.body).to include("Check these 2 answers") expect(response.body).to include(bulk_upload.filename) expect(response.body).to include("Are these fields correct?")