shoulda-matchers 3.0.0.rc1 → 3.0.0

data/spec/unit/shoulda/matchers/active_model/validate_acceptance_of_matcher_spec.rb

@@ -3,28 +3,28 @@ require 'unit_spec_helper'
 describe Shoulda::Matchers::ActiveModel::ValidateAcceptanceOfMatcher, type: :model do
   context 'a model with an acceptance validation' do
     it 'accepts when the attributes match' do
-      expect(validating_acceptance).to matcher
+      expect(record_validating_acceptance).to matcher
     end
 
     it 'does not overwrite the default message with nil' do
-      expect(validating_acceptance).to matcher.with_message(nil)
+      expect(record_validating_acceptance).to matcher.with_message(nil)
     end
   end
 
   context 'a model without an acceptance validation' do
     it 'rejects' do
-      expect(define_model(:example, attr: :string).new).not_to matcher
+      expect(record_validating_nothing).not_to matcher
     end
   end
 
   context 'an attribute which must be accepted with a custom message' do
     it 'accepts when the message matches' do
-      expect(validating_acceptance(message: 'custom')).
+      expect(record_validating_acceptance(message: 'custom')).
         to matcher.with_message(/custom/)
     end
 
     it 'rejects when the message does not match' do
-      expect(validating_acceptance(message: 'custom')).
+      expect(record_validating_acceptance(message: 'custom')).
         not_to matcher.with_message(/wrong/)
     end
   end
@@ -33,9 +33,21 @@ describe Shoulda::Matchers::ActiveModel::ValidateAcceptanceOfMatcher, type: :mod
     validate_acceptance_of(:attr)
   end
 
-  def validating_acceptance(options = {})
-    define_model(:example, attr: :string) do
+  def model_validating_nothing(&block)
+    define_active_model_class(:example, accessors: [:attr], &block)
+  end
+
+  def record_validating_nothing
+    model_validating_nothing.new
+  end
+
+  def model_validating_acceptance(options = {})
+    model_validating_nothing do
       validates_acceptance_of :attr, options
-    end.new
+    end
+  end
+
+  def record_validating_acceptance(options = {})
+    model_validating_acceptance(options).new
   end
 end

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

@@ -229,20 +229,6 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
         )
         expect(record).to validate_numericality.is_less_than_or_equal_to(18)
       end
-
-      context 'if the given value is right at the allowed max value for the column' do
-        it 'does not raise an error' do
-          record = build_record_with_integer_column_of_limit(2,
-            less_than_or_equal_to: 32767
-          )
-          assertion = lambda do
-            expect(record).
-              to validate_numericality.
-              is_less_than_or_equal_to(32767)
-          end
-          expect(&assertion).not_to raise_error
-        end
-      end
     end
 
     context 'and not validating with less_than_or_equal_to' do
@@ -268,16 +254,6 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
           to validate_numericality.
           is_less_than(18)
       end
-
-      context 'if the given value is right at the allowed max value for the column' do
-        it 'does not raise an error' do
-          record = build_record_with_integer_column_of_limit(2, less_than: 32767)
-          assertion = lambda do
-            expect(record).to validate_numericality.is_less_than(32767)
-          end
-          expect(&assertion).not_to raise_error
-        end
-      end
     end
 
     context 'and not validating with less_than' do
@@ -301,26 +277,6 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
         record = build_record_validating_numericality(equal_to: 18)
         expect(record).to validate_numericality.is_equal_to(18)
       end
-
-      context 'if the given value is right at the allowed min value for the column' do
-        it 'does not raise an error' do
-          record = build_record_with_integer_column_of_limit(2, equal_to: -32768)
-          assertion = lambda do
-            expect(record).to validate_numericality.is_equal_to(-32768)
-          end
-          expect(&assertion).not_to raise_error
-        end
-      end
-
-      context 'if the given value is right at the allowed max value for the column' do
-        it 'does not raise an error' do
-          record = build_record_with_integer_column_of_limit(2, equal_to: 32767)
-          assertion = lambda do
-            expect(record).to validate_numericality.is_equal_to(32767)
-          end
-          expect(&assertion).not_to raise_error
-        end
-      end
     end
 
     context 'and not validating with equal_to' do
@@ -346,20 +302,6 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
           to validate_numericality.
           is_greater_than_or_equal_to(18)
       end
-
-      context 'if the given value is right at the allowed min value for the column' do
-        it 'does not raise an error' do
-          record = build_record_with_integer_column_of_limit(2,
-            greater_than_or_equal_to: -32768
-          )
-          assertion = lambda do
-            expect(record).
-              to validate_numericality_of(:attr).
-              is_greater_than_or_equal_to(-32768)
-          end
-          expect(&assertion).not_to raise_error
-        end
-      end
     end
 
     context 'not validating with greater_than_or_equal_to' do
@@ -385,20 +327,6 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
           to validate_numericality.
           is_greater_than(18)
       end
-
-      context 'if the given value is right at the allowed min value for the column' do
-        it 'does not raise an error' do
-          record = build_record_with_integer_column_of_limit(2,
-            greater_than: -32768
-          )
-          assertion = lambda do
-            expect(record).
-              to validate_numericality_of(:attr).
-              is_greater_than(-32768)
-          end
-          expect(&assertion).not_to raise_error
-        end
-      end
     end
 
     context 'and not validating with greater_than' do
@@ -511,13 +439,11 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
             only_integer.
             is_greater_than(18)
         end
-        message = format_message_according_to_rails_version(
-          <<-MESSAGE.strip_heredoc
-            Expected errors to include "must be an integer" when attr is set to 0.1,
-            got errors:
-            * "must be greater than 18" (attribute: attr, value: "0.1")
-          MESSAGE
-        )
+        message = <<-MESSAGE.strip_heredoc
+          Expected errors to include "must be an integer" when attr is set to "0.1",
+          got errors:
+          * "must be greater than 18" (attribute: attr, value: "0.1")
+        MESSAGE
         expect(&assertion).to fail_with_message(message)
       end
 
@@ -529,13 +455,11 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
             only_integer.
             is_greater_than(18)
         end
-        message = format_message_according_to_rails_version(
-          <<-MESSAGE.strip_heredoc
-            Expected errors to include "must be an integer" when attr is set to 0.1,
-            got errors:
-            * "must be greater than 18" (attribute: attr, value: "0.1")
-          MESSAGE
-        )
+        message = <<-MESSAGE.strip_heredoc
+          Expected errors to include "must be an integer" when attr is set to "0.1",
+          got errors:
+          * "must be greater than 18" (attribute: attr, value: "0.1")
+        MESSAGE
         expect(&assertion).to fail_with_message(message)
       end
 
@@ -550,12 +474,10 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
             even.
             is_greater_than(18)
         end
-        message = format_message_according_to_rails_version(
-          <<-MESSAGE.strip_heredoc
-            Expected errors to include "must be greater than 18" when attr is set to 18,
-            got no errors
-          MESSAGE
-        )
+        message = <<-MESSAGE.strip_heredoc
+          Expected errors to include "must be greater than 18" when attr is set to "18",
+          got no errors
+        MESSAGE
         expect(&assertion).to fail_with_message(message)
       end
 
@@ -570,13 +492,11 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
             even.
             is_greater_than(18)
         end
-        message = format_message_according_to_rails_version(
-          <<-MESSAGE.strip_heredoc
-            Expected errors to include "must be even" when attr is set to 1,
-            got errors:
-            * "must be greater than 18" (attribute: attr, value: "1")
-          MESSAGE
-        )
+        message = <<-MESSAGE.strip_heredoc
+          Expected errors to include "must be even" when attr is set to "1",
+          got errors:
+          * "must be greater than 18" (attribute: attr, value: "1")
+        MESSAGE
         expect(&assertion).to fail_with_message(message)
       end
 
@@ -591,12 +511,10 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
             odd.
             is_less_than_or_equal_to(99)
         end
-        message = format_message_according_to_rails_version(
-          <<-MESSAGE.strip_heredoc
-            Expected errors to include "must be less than or equal to 99" when attr is set to 101,
-            got no errors
-          MESSAGE
-        )
+        message = <<-MESSAGE.strip_heredoc
+          Expected errors to include "must be less than or equal to 99" when attr is set to "101",
+          got no errors
+        MESSAGE
         expect(&assertion).to fail_with_message(message)
       end
 
@@ -613,12 +531,10 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
             is_greater_than(18).
             is_less_than(99)
         end
-        message = format_message_according_to_rails_version(
-          <<-MESSAGE.strip_heredoc
-            Expected errors to include "must be greater than 18" when attr is set to 18,
-            got no errors
-          MESSAGE
-        )
+        message = <<-MESSAGE.strip_heredoc
+          Expected errors to include "must be greater than 18" when attr is set to "18",
+          got no errors
+        MESSAGE
         expect(&assertion).to fail_with_message(message)
       end
     end
@@ -635,13 +551,11 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
             only_integer.
             is_greater_than(18)
         end
-        message = format_message_according_to_rails_version(
-          <<-MESSAGE.strip_heredoc
-            Expected errors to include "must be greater than 18" when attr is set to 18,
-            got errors:
-            * "must be greater than 19" (attribute: attr, value: "19")
-          MESSAGE
-        )
+        message = <<-MESSAGE.strip_heredoc
+          Expected errors to include "must be greater than 18" when attr is set to "18",
+          got errors:
+          * "must be greater than 19" (attribute: attr, value: "19")
+        MESSAGE
         expect(&assertion).to fail_with_message(message)
       end
 
@@ -656,12 +570,10 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
             only_integer.
             is_greater_than(18)
         end
-        message = format_message_according_to_rails_version(
-          <<-MESSAGE.strip_heredoc
-            Expected errors to include "must be greater than 18" when attr is set to 18,
-            got no errors
-          MESSAGE
-        )
+        message = <<-MESSAGE.strip_heredoc
+          Expected errors to include "must be greater than 18" when attr is set to "18",
+          got no errors
+        MESSAGE
         expect(&assertion).to fail_with_message(message)
       end
 
@@ -676,13 +588,11 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
             even.
             is_greater_than(18)
         end
-        message = format_message_according_to_rails_version(
-          <<-MESSAGE.strip_heredoc
-            Expected errors to include "must be greater than 18" when attr is set to 18,
-            got errors:
-            * "must be greater than 20" (attribute: attr, value: "20")
-          MESSAGE
-        )
+        message = <<-MESSAGE.strip_heredoc
+          Expected errors to include "must be greater than 18" when attr is set to "18",
+          got errors:
+          * "must be greater than 20" (attribute: attr, value: "20")
+        MESSAGE
         expect(&assertion).to fail_with_message(message)
       end
 
@@ -697,12 +607,10 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
             even.
             is_greater_than(18)
         end
-        message = format_message_according_to_rails_version(
-          <<-MESSAGE.strip_heredoc
-            Expected errors to include "must be greater than 18" when attr is set to 18,
-            got no errors
-          MESSAGE
-        )
+        message = <<-MESSAGE.strip_heredoc
+          Expected errors to include "must be greater than 18" when attr is set to "18",
+          got no errors
+        MESSAGE
         expect(&assertion).to fail_with_message(message)
       end
 
@@ -717,12 +625,10 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
             odd.
             is_less_than_or_equal_to(99)
         end
-        message = format_message_according_to_rails_version(
-          <<-MESSAGE.strip_heredoc
-            Expected errors to include "must be less than or equal to 99" when attr is set to 101,
-            got no errors
-          MESSAGE
-        )
+        message = <<-MESSAGE.strip_heredoc
+          Expected errors to include "must be less than or equal to 99" when attr is set to "101",
+          got no errors
+        MESSAGE
         expect(&assertion).to fail_with_message(message)
       end
 
@@ -737,13 +643,11 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
             odd.
             is_less_than_or_equal_to(99)
         end
-        message = format_message_according_to_rails_version(
-          <<-MESSAGE.strip_heredoc
-            Expected errors to include "must be less than or equal to 99" when attr is set to 101,
-            got errors:
-            * "must be less than or equal to 97" (attribute: attr, value: "101")
-          MESSAGE
-        )
+        message = <<-MESSAGE.strip_heredoc
+          Expected errors to include "must be less than or equal to 99" when attr is set to "101",
+          got errors:
+          * "must be less than or equal to 97" (attribute: attr, value: "101")
+        MESSAGE
         expect(&assertion).to fail_with_message(message)
       end
 
@@ -760,13 +664,11 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
             is_greater_than(18).
             is_less_than(99)
         end
-        message = format_message_according_to_rails_version(
-          <<-MESSAGE.strip_heredoc
-            Expected errors to include "must be greater than 18" when attr is set to 18,
-            got errors:
-            * "must be greater than 19" (attribute: attr, value: "19")
-          MESSAGE
-        )
+        message = <<-MESSAGE.strip_heredoc
+          Expected errors to include "must be greater than 18" when attr is set to "18",
+          got errors:
+          * "must be greater than 19" (attribute: attr, value: "19")
+        MESSAGE
         expect(&assertion).to fail_with_message(message)
       end
 
@@ -783,13 +685,11 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
             is_greater_than(18).
             is_less_than(99)
         end
-        message = format_message_according_to_rails_version(
-          <<-MESSAGE.strip_heredoc
-            Expected errors to include "must be less than 99" when attr is set to 100,
-            got errors:
-            * "must be less than 100" (attribute: attr, value: "100")
-          MESSAGE
-        )
+        message = <<-MESSAGE.strip_heredoc
+          Expected errors to include "must be less than 99" when attr is set to "100",
+          got errors:
+          * "must be less than 100" (attribute: attr, value: "100")
+        MESSAGE
         expect(&assertion).to fail_with_message(message)
       end
     end
@@ -970,23 +870,4 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
   def attribute_name
     :attr
   end
-
-  def define_model_with_integer_column_of_limit(limit, validation_options = {})
-    column_options = { type: :integer, options: { limit: limit } }
-    define_model :example, attribute_name => column_options do |model|
-      model.validates_numericality_of(attribute_name, validation_options)
-    end
-  end
-
-  def build_record_with_integer_column_of_limit(limit, validation_options = {})
-    define_model_with_integer_column_of_limit(limit, validation_options).new
-  end
-
-  def format_message_according_to_rails_version(message)
-    if rails_gte_4_2?
-      message
-    else
-      message.gsub(/"((?:\d+)(?:\.\d+)?)"/, '\1')
-    end
-  end
 end

data/spec/unit/shoulda/matchers/active_model/validate_presence_of_matcher_spec.rb

@@ -163,6 +163,20 @@ describe Shoulda::Matchers::ActiveModel::ValidatePresenceOfMatcher, type: :model
     end
   end
 
+  context 'when the attribute typecasts nil to an empty array' do
+    it 'accepts' do
+      model = define_active_model_class :example do
+        attr_reader :foo
+
+        def foo=(value)
+          @foo = Array.wrap(value)
+        end
+      end
+
+      expect(model.new).to validate_presence_of(:foo)
+    end
+  end
+
   def matcher
     validate_presence_of(:attr)
   end