From c4897143ce6b3df54898a8588f931d98977453c6 Mon Sep 17 00:00:00 2001
From: Samuel Young <samuel.young@softwire.com>
Date: Mon, 12 Jan 2026 16:28:03 +0000
Subject: [PATCH] fixup! CLDC-4162: Update tests for existing years

properly mark year specific tests
---
 .../bulk_upload/lettings/validator_spec.rb    | 42 ++++++++++++++-----
 .../bulk_upload/sales/validator_spec.rb       | 39 +++++++++++++----
 2 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/spec/services/bulk_upload/lettings/validator_spec.rb b/spec/services/bulk_upload/lettings/validator_spec.rb
index 0a4a83fc4..e2b7e48e5 100644
--- a/spec/services/bulk_upload/lettings/validator_spec.rb
+++ b/spec/services/bulk_upload/lettings/validator_spec.rb
@@ -159,18 +159,40 @@ RSpec.describe BulkUpload::Lettings::Validator do
         expect { validator.call }.to change(BulkUploadError, :count)
       end
 
-      it "create validation error with correct values" do
-        validator.call
+      context "and in 2025", metadata: { year: 2025 } do
+        let(:year) { 2025 }
 
-        error = BulkUploadError.find_by(field: "field_4")
+        it "create validation error with correct values" do
+          validator.call
 
-        expect(error.field).to eql("field_4")
-        expect(error.error).to eql("You must answer needs type.")
-        expect(error.tenant_code).to eql(log.tenancycode)
-        expect(error.property_ref).to eql(log.propcode)
-        expect(error.row).to eql("2")
-        expect(error.cell).to eql("CX2")
-        expect(error.col).to eql("CX")
+          error = BulkUploadError.find_by(field: "field_4")
+
+          expect(error.field).to eql("field_4")
+          expect(error.error).to eql("You must answer needs type.")
+          expect(error.tenant_code).to eql(log.tenancycode)
+          expect(error.property_ref).to eql(log.propcode)
+          expect(error.row).to eql("2")
+          expect(error.cell).to eql("CX2")
+          expect(error.col).to eql("CX")
+        end
+      end
+
+      context "and in 2026", metadata: { year: 2026 } do
+        let(:year) { 2026 }
+
+        it "create validation error with correct values" do
+          validator.call
+
+          error = BulkUploadError.find_by(field: "field_4")
+
+          expect(error.field).to eql("field_4")
+          expect(error.error).to eql("You must answer needs type.")
+          expect(error.tenant_code).to eql(log.tenancycode)
+          expect(error.property_ref).to eql(log.propcode)
+          expect(error.row).to eql("2")
+          expect(error.cell).to eql("CX2")
+          expect(error.col).to eql("CX")
+        end
       end
     end
 
diff --git a/spec/services/bulk_upload/sales/validator_spec.rb b/spec/services/bulk_upload/sales/validator_spec.rb
index cc750e50d..d07edfcbe 100644
--- a/spec/services/bulk_upload/sales/validator_spec.rb
+++ b/spec/services/bulk_upload/sales/validator_spec.rb
@@ -136,17 +136,38 @@ RSpec.describe BulkUpload::Sales::Validator do
         expect { validator.call }.to change(BulkUploadError, :count)
       end
 
-      it "create validation error with correct values" do
-        validator.call
+      context "and in 2025", metadata: { year: 2025 } do
+        let(:year) { 2025 }
+
+        it "create validation error with correct values" do
+          validator.call
+
+          error = BulkUploadError.find_by(row: "2", field: "field_4", category: "setup")
 
-        error = BulkUploadError.find_by(row: "2", field: "field_4", category: "setup")
+          expect(error.field).to eql("field_4")
+          expect(error.error).to eql("You must answer owning organisation.")
+          expect(error.purchaser_code).to eql(log.purchaser_code)
+          expect(error.row).to eql("2")
+          expect(error.cell).to eql("E2")
+          expect(error.col).to eql("E")
+        end
+      end
 
-        expect(error.field).to eql("field_4")
-        expect(error.error).to eql("You must answer owning organisation.")
-        expect(error.purchaser_code).to eql(log.purchaser_code)
-        expect(error.row).to eql("2")
-        expect(error.cell).to eql("E2")
-        expect(error.col).to eql("E")
+      context "and in 2026", metadata: { year: 2026 } do
+        let(:year) { 2026 }
+
+        it "create validation error with correct values" do
+          validator.call
+
+          error = BulkUploadError.find_by(row: "2", field: "field_4", category: "setup")
+
+          expect(error.field).to eql("field_4")
+          expect(error.error).to eql("You must answer owning organisation.")
+          expect(error.purchaser_code).to eql(log.purchaser_code)
+          expect(error.row).to eql("2")
+          expect(error.cell).to eql("E2")
+          expect(error.col).to eql("E")
+        end
       end
     end