feat: rename methods and enable feature toggle

config/initializers/feature_toggle.rb

@@ -13,7 +13,7 @@ class FeatureToggle
   end
 
   def self.saledate_two_week_validation_enabled?
-    Rails.env.production? || Rails.env.test? || Rails.env.staging? || true
+    Rails.env.production? || Rails.env.test? || Rails.env.staging?
   end
 
   def self.sales_log_enabled?

spec/models/validations/sales/setup_validations_spec.rb

@@ -5,13 +5,13 @@ RSpec.describe Validations::Sales::SetupValidations do
 
   let(:validator_class) { Class.new { include Validations::Sales::SetupValidations } }
 
-  describe "#validate_saledate" do
+  describe "#validate_saledate_collection_year" do
     context "with sales_in_crossover_period == false" do
       context "when saledate is blank" do
         let(:record) { build(:sales_log, saledate: nil) }
 
         it "does not add an error" do
-          setup_validator.validate_saledate(record)
+          setup_validator.validate_saledate_collection_year(record)
 
           expect(record.errors).to be_empty
         end
@@ -21,7 +21,7 @@ RSpec.describe Validations::Sales::SetupValidations do
         let(:record) { build(:sales_log, saledate: Time.zone.local(2023, 1, 1)) }
 
         it "does not add an error" do
-          setup_validator.validate_saledate(record)
+          setup_validator.validate_saledate_collection_year(record)
 
           expect(record.errors).to be_empty
         end
@@ -31,7 +31,7 @@ RSpec.describe Validations::Sales::SetupValidations do
         let(:record) { build(:sales_log, saledate: Time.zone.local(2020, 1, 1)) }
 
         it "adds error" do
-          setup_validator.validate_saledate(record)
+          setup_validator.validate_saledate_collection_year(record)
 
           expect(record.errors[:saledate]).to include("Enter a date within the 22/23 collection year, which is between 1st April 2022 and 31st March 2023")
         end
@@ -41,7 +41,7 @@ RSpec.describe Validations::Sales::SetupValidations do
         let(:record) { build(:sales_log, saledate: Time.zone.local(2025, 4, 1)) }
 
         it "adds error" do
-          setup_validator.validate_saledate(record)
+          setup_validator.validate_saledate_collection_year(record)
 
           expect(record.errors[:saledate]).to include("Enter a date within the 22/23 collection year, which is between 1st April 2022 and 31st March 2023")
         end
@@ -61,7 +61,7 @@ RSpec.describe Validations::Sales::SetupValidations do
         let(:record) { build(:sales_log, saledate: nil) }
 
         it "does not add an error" do
-          setup_validator.validate_saledate(record)
+          setup_validator.validate_saledate_collection_year(record)
 
           expect(record.errors).to be_empty
         end
@@ -71,7 +71,7 @@ RSpec.describe Validations::Sales::SetupValidations do
         let(:record) { build(:sales_log, saledate: Time.zone.local(2024, 1, 1)) }
 
         it "does not add an error" do
-          setup_validator.validate_saledate(record)
+          setup_validator.validate_saledate_collection_year(record)
 
           expect(record.errors).to be_empty
         end
@@ -81,7 +81,7 @@ RSpec.describe Validations::Sales::SetupValidations do
         let(:record) { build(:sales_log, saledate: Time.zone.local(2020, 5, 1)) }
 
         it "adds error" do
-          setup_validator.validate_saledate(record)
+          setup_validator.validate_saledate_collection_year(record)
 
           expect(record.errors[:saledate]).to include("Enter a date within the 23/24 or 24/25 collection years, which is between 1st April 2023 and 31st March 2025")
         end
@@ -91,7 +91,7 @@ RSpec.describe Validations::Sales::SetupValidations do
         let(:record) { build(:sales_log, saledate: Time.zone.local(2025, 4, 1)) }
 
         it "adds error" do
-          setup_validator.validate_saledate(record)
+          setup_validator.validate_saledate_collection_year(record)
 
           expect(record.errors[:saledate]).to include("Enter a date within the 23/24 or 24/25 collection years, which is between 1st April 2023 and 31st March 2025")
         end