Failing test strict option on numericality matcher

lib/shoulda/matchers/active_model/numericality_matchers/comparison_matcher.rb

@@ -24,6 +24,11 @@ def initialize(numericality_matcher, value, operator)
             @strict = false
           end
 
+          def strict
+            @strict = true
+            self
+          end
+
           def for(attribute)
             @attribute = attribute
             self

lib/shoulda/matchers/active_model/numericality_matchers/even_number_matcher.rb

@@ -20,6 +20,11 @@ def allowed_type
           def diff_to_compare
             2
           end
+
+          def strict
+            @disallow_value_matcher.strict
+            self
+          end
         end
       end
     end

lib/shoulda/matchers/active_model/numericality_matchers/odd_number_matcher.rb

@@ -20,6 +20,11 @@ def allowed_type
           def diff_to_compare
             2
           end
+
+          def strict
+            @disallow_value_matcher.strict
+            self
+          end
         end
       end
     end

lib/shoulda/matchers/active_model/numericality_matchers/only_integer_matcher.rb

@@ -19,6 +19,11 @@ def allowed_type
           def diff_to_compare
             1
           end
+
+          def strict
+            @disallow_value_matcher.strict
+            self
+          end
         end
       end
     end

lib/shoulda/matchers/active_model/validate_numericality_of_matcher.rb

@@ -293,6 +293,13 @@ def initialize(attribute)
           add_disallow_value_matcher
         end
 
+        def strict
+          @submatchers.each do |submatcher|
+            submatcher.strict
+          end
+          self
+        end
+
         def only_integer
           prepare_submatcher(
             NumericalityMatchers::OnlyIntegerMatcher.new(@attribute)

spec/unit/shoulda/matchers/active_model/numericality_matchers/comparison_matcher_spec.rb

@@ -18,6 +18,10 @@ class << fake_matcher
   end
 
   context 'is_greater_than' do
+    it do
+      expect(instance_with_validations(greater_than: 1, strict: true)).to matcher.is_greater_than(1).strict
+    end
+
     it do
       expect(instance_with_validations(greater_than: 2))
         .to matcher.is_greater_than(2)
@@ -39,6 +43,11 @@ class << fake_matcher
   end
 
   context 'greater_than_or_equal_to' do
+    it do
+      expect(instance_with_validations(greater_than_or_equal_to: 2, strict: true))
+        .to matcher.is_greater_than_or_equal_to(2).strict
+    end
+
     it do
       expect(instance_with_validations(greater_than_or_equal_to: 2))
         .to matcher.is_greater_than_or_equal_to(2)
@@ -61,6 +70,11 @@ class << fake_matcher
   end
 
   context 'less_than' do
+    it do
+      expect(instance_with_validations(less_than: 2, strict: true))
+        .to matcher.is_less_than(2).strict
+    end
+
     it do
       expect(instance_with_validations(less_than: 2))
         .to matcher.is_less_than(2)
@@ -83,6 +97,11 @@ class << fake_matcher
   end
 
   context 'less_than_or_equal_to' do
+    it do
+      expect(instance_with_validations(less_than_or_equal_to: 2, strict: true))
+        .to matcher.is_less_than_or_equal_to(2).strict
+    end
+
     it do
       expect(instance_with_validations(less_than_or_equal_to: 2))
         .to matcher.is_less_than_or_equal_to(2)
@@ -105,6 +124,11 @@ class << fake_matcher
   end
 
   context 'is_equal_to' do
+    it do
+      expect(instance_with_validations(equal_to: 0, strict: true))
+        .to matcher.is_equal_to(0).strict
+    end
+
     it do
       expect(instance_with_validations(equal_to: 0))
         .to matcher.is_equal_to(0)

spec/unit/shoulda/matchers/active_model/numericality_matchers/even_number_matcher_spec.rb

@@ -14,6 +14,12 @@
     it { expect(subject.diff_to_compare).to eq 2 }
   end
 
+  describe '#strict' do
+    it 'sets the strict matcher' do
+      expect(validating_even_number(strict: true)).to subject.strict
+    end
+  end
+
   context 'when the model has an even validation' do
     it 'matches' do
       match = subject
@@ -56,4 +62,4 @@ def not_validating_even_number
     define_model(:example, attr: :string).new
   end
 
-end
+end

spec/unit/shoulda/matchers/active_model/numericality_matchers/odd_number_matcher_spec.rb

@@ -14,6 +14,12 @@
     it { expect(subject.diff_to_compare).to eq 2 }
   end
 
+  describe '#strict' do
+    it 'allows strict' do
+      expect(validating_odd_number(strict: true)).to subject.strict
+    end
+  end
+
   context 'when the model has an odd validation' do
     it 'matches' do
       match = subject
@@ -56,4 +62,4 @@ def not_validating_odd_number
     define_model(:example, attr: :string).new
   end
 
-end
+end

spec/unit/shoulda/matchers/active_model/numericality_matchers/only_integer_matcher_spec.rb

@@ -14,6 +14,12 @@
     it { expect(subject.diff_to_compare).to eq 1 }
   end
 
+  describe '#strict' do
+    it 'sets strict properly' do
+      expect(validating_only_integer(strict: true)).to subject.strict
+    end
+  end
+
   context 'given an attribute that only allows integer values' do
     it 'matches' do
       match = subject

spec/unit/shoulda/matchers/active_model/validate_numericality_of_matcher_spec.rb

@@ -66,6 +66,26 @@
     end
   end
 
+  context "with the strict option" do
+    it "allows strict values for that attribute" do
+      expect(validating_numericality(strict: true)).to matcher.strict
+    end
+
+    it "rejects when model does not enforce strict" do
+      expect(validating_numericality).to_not matcher.strict
+    end
+
+    it "rejects with the ActiveRecord :not_a_number exception" do
+      the_matcher = matcher.strict
+      failure_message =
+        "Expected exception to include \"Attr is not a number\" when attr is set to \"abcd\""
+
+      expect do
+        expect(validating_numericality).to the_matcher
+      end.to fail_with_message_including(failure_message)
+    end
+  end
+
   context 'with the only_integer option' do
     it 'allows integer values for that attribute' do
       expect(validating_numericality(only_integer: true)).to matcher.only_integer
@@ -200,17 +220,24 @@
         expect(validating_numericality(even: true, greater_than: 18))
           .to matcher.even.is_greater_than(18)
       end
+
       it do
         expect(validating_numericality(odd: true, less_than_or_equal_to: 99))
           .to matcher.odd.is_less_than_or_equal_to(99)
       end
 
+      it do
+        expect(validating_numericality(strict: true, greater_than: 99))
+          .to matcher.is_greater_than(99).strict
+      end
+
       it do
         expect(validating_numericality(
                  only_integer: true,
                  greater_than: 18,
-                 less_than: 99)
-        ).to matcher.only_integer.is_greater_than(18).is_less_than(99)
+                 less_than: 99,
+                 strict: true)
+              ).to matcher.only_integer.is_greater_than(18).is_less_than(99).strict
       end
     end