Fix failing specs

ministryofjustice · Jan 13, 2025 · 63b9599 · 63b9599
1 parent a5ad9e7
commit 63b9599
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 17 deletions.
diff --git a/app/forms/concerns/steps/payment_fieldset_validation.rb b/app/forms/concerns/steps/payment_fieldset_validation.rb
@@ -3,21 +3,14 @@ module PaymentFieldsetValidation
     extend ActiveSupport::Concern
 
     def validate_frequency
-      if frequency.blank?
-        errors.add(:frequency, :blank, payment_type: payment_type_label)
-      elsif frequencies.exclude?(frequency)
-        errors.add(:frequency, :inclusion, payment_type: payment_type_label&.capitalize)
-      end
+      errors.add(:frequency, :blank, payment_type: payment_type_label) if frequency.blank?
+      errors.add(:frequency, :inclusion, payment_type: payment_type_label&.capitalize) if frequencies.exclude?(frequency)
     end
 
     def validate_amount
-      if amount.blank?
-        errors.add(:amount, :blank, payment_type: payment_type_label)
-      elsif Type::Pence.new.serialize(amount).nil?
-        errors.add(:amount, :not_a_number, payment_type: payment_type_label)
-      elsif amount.to_i <= 0
-        errors.add(:amount, :greater_than, payment_type: payment_type_label)
-      end
+      errors.add(:amount, :blank, payment_type: payment_type_label) if amount.blank?
+      errors.add(:amount, :not_a_number, payment_type: payment_type_label) if Type::Pence.new.serialize(amount).nil?
+      errors.add(:amount, :greater_than, payment_type: payment_type_label) if amount.to_i <= 0
     end
   end
 end
diff --git a/app/validators/income_payments_validator.rb b/app/validators/income_payments_validator.rb
@@ -25,7 +25,7 @@ def add_errors(income_payment)
 
       # We define the attribute getter as it doesn't really exist
       record.define_singleton_method(attr_name) do
-        outgoings_payment.public_send(error.attribute)
+        income_payment.public_send(error.attribute)
       end
     end
   end

diff --git a/spec/forms/steps/income/income_benefits_form_spec.rb b/spec/forms/steps/income/income_benefits_form_spec.rb
@@ -114,9 +114,10 @@
           end
 
           it 'has error messages' do
-            expect(subject.errors.count).to be(4)
+            expect(subject.errors.count).to be(5)
             expect(subject.errors.of_kind?('child-amount', :blank)).to be(true)
             expect(subject.errors.of_kind?('child-amount', :not_a_number)).to be(true)
+            expect(subject.errors.of_kind?('child-amount', :greater_than)).to be(true)
             expect(subject.errors.of_kind?('child-frequency', :inclusion)).to be(true)
             expect(subject.errors.of_kind?('jsa-details', :invalid)).to be(true)
 

diff --git a/spec/forms/steps/income/income_payments_form_spec.rb b/spec/forms/steps/income/income_payments_form_spec.rb
@@ -135,9 +135,10 @@
           end
 
           it 'has error messages' do
-            expect(subject.errors.count).to be(4)
+            expect(subject.errors.count).to be(5)
             expect(subject.errors.of_kind?('maintenance-amount', :blank)).to be(true)
             expect(subject.errors.of_kind?('maintenance-amount', :not_a_number)).to be(true)
+            expect(subject.errors.of_kind?('maintenance-amount', :greater_than)).to be(true)
             expect(subject.errors.of_kind?('maintenance-frequency', :inclusion)).to be(true)
             expect(subject.errors.of_kind?('student-loan-grant-details', :invalid)).to be(true)
 

diff --git a/spec/forms/steps/income/partner/income_payments_form_spec.rb b/spec/forms/steps/income/partner/income_payments_form_spec.rb
@@ -132,9 +132,10 @@
           end
 
           it 'has error messages' do
-            expect(subject.errors.count).to be(4)
+            expect(subject.errors.count).to be(5)
             expect(subject.errors.of_kind?('maintenance-amount', :blank)).to be(true)
             expect(subject.errors.of_kind?('maintenance-amount', :not_a_number)).to be(true)
+            expect(subject.errors.of_kind?('maintenance-amount', :greater_than)).to be(true)
             expect(subject.errors.of_kind?('maintenance-frequency', :inclusion)).to be(true)
             expect(subject.errors.of_kind?('student-loan-grant-details', :invalid)).to be(true)
 

diff --git a/spec/forms/steps/outgoings/outgoings_payments_form_spec.rb b/spec/forms/steps/outgoings/outgoings_payments_form_spec.rb
@@ -88,8 +88,10 @@
           end
 
           it 'has error messages' do
-            expect(subject.errors.count).to be(2)
+            expect(subject.errors.count).to be(4)
             expect(subject.errors.of_kind?('childcare-amount', :blank)).to be(true)
+            expect(subject.errors.of_kind?('childcare-amount', :not_a_number)).to be(true)
+            expect(subject.errors.of_kind?('childcare-amount', :greater_than)).to be(true)
             expect(subject.errors.of_kind?('childcare-frequency', :inclusion)).to be(true)
 
             # Error attributes should respond