shoulda-matchers 2.8.0.rc1 → 2.8.0.rc2

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

@@ -68,6 +68,30 @@ describe Shoulda::Matchers::ActiveModel::ValidateInclusionOfMatcher, type: :mode
       end
     end
 
+    context 'against an attribute with a specific column limit' do
+      it 'does not raise an exception when attempting to use the matcher' do
+        possible_values = (1..5).to_a
+        builder = build_object_allowing(possible_values)
+        assertion = -> { expect_to_match_on_values(builder, possible_values) }
+        expect(&assertion).not_to raise_error
+      end
+
+      def build_object(options = {}, &block)
+        build_object_with_generic_attribute(
+          options.merge(
+            column_type: :integer,
+            column_options: { limit: 2 },
+            value: 1
+          ),
+          &block
+        )
+      end
+
+      def expect_to_match_on_values(builder, values, &block)
+        expect_to_match_in_array(builder, values, &block)
+      end
+    end
+
     context "against a float attribute" do
       it_behaves_like 'it supports in_array',
         possible_values: [1.0, 2.0, 3.0, 4.0, 5.0],

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

@@ -18,11 +18,11 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
 
     it 'rejects with the ActiveRecord :not_a_number message' do
       the_matcher = matcher
-
-      the_matcher.matches?(define_model(:example, attr: :string).new)
-
-      expect(the_matcher.failure_message_when_negated)
-        .to include 'Did not expect errors to include "is not a number"'
+      expect do
+        expect(not_validating_numericality).to the_matcher
+      end.to fail_with_message_including(
+        'Expected errors to include "is not a number"'
+      )
     end
 
     it 'rejects with the ActiveRecord :not_an_integer message' do
@@ -123,6 +123,72 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
     end
   end
 
+  context 'qualified with less_than_or_equal_to' do
+    it 'does not raise an error if the given value is right at the allowed max value for the column' do
+      record = record_with_integer_column_of_limit(:attr, 2, less_than_or_equal_to: 32767)
+      assertion = -> {
+        expect(record).to validate_numericality_of(:attr).is_less_than_or_equal_to(32767)
+      }
+      expect(&assertion).not_to raise_error
+    end
+  end
+
+  context 'qualified with less_than' do
+    it 'does not raise an error if the given value is right at the allowed max value for the column' do
+      record = record_with_integer_column_of_limit(:attr, 2, less_than: 32767)
+      assertion = -> {
+        expect(record).to validate_numericality_of(:attr).is_less_than(32767)
+      }
+      expect(&assertion).not_to raise_error
+    end
+  end
+
+  context 'qualified with equal_to' do
+    it 'does not raise an error if the given value is right at the allowed min value for the column' do
+      record = record_with_integer_column_of_limit(:attr, 2, equal_to: -32768)
+      assertion = -> {
+        expect(record).to validate_numericality_of(:attr).is_equal_to(-32768)
+      }
+      expect(&assertion).not_to raise_error
+    end
+
+    it 'does not raise an error if the given value is right at the allowed max value for the column' do
+      record = record_with_integer_column_of_limit(:attr, 2, equal_to: 32767)
+      assertion = -> {
+        expect(record).to validate_numericality_of(:attr).is_equal_to(32767)
+      }
+      expect(&assertion).not_to raise_error
+    end
+  end
+
+  context 'qualified with greater_than_or_equal to' do
+    it 'does not raise an error if the given value is right at the allowed min value for the column' do
+      record = record_with_integer_column_of_limit(:attr, 2,
+        greater_than_or_equal_to: -32768
+      )
+      assertion = -> {
+        expect(record).
+          to validate_numericality_of(:attr).
+          is_greater_than_or_equal_to(-32768)
+      }
+      expect(&assertion).not_to raise_error
+    end
+  end
+
+  context 'qualified with greater_than' do
+    it 'does not raise an error if the given value is right at the allowed min value for the column' do
+      record = record_with_integer_column_of_limit(:attr, 2,
+        greater_than: -32768
+      )
+      assertion = -> {
+        expect(record).
+          to validate_numericality_of(:attr).
+          is_greater_than(-32768)
+      }
+      expect(&assertion).not_to raise_error
+    end
+  end
+
   context 'with multiple options together' do
     context 'the success cases' do
       it do
@@ -349,4 +415,11 @@ describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher, type: :m
   def matcher
     validate_numericality_of(:attr)
   end
+
+  def record_with_integer_column_of_limit(attribute, limit, validation_options = {})
+    column_options = { type: :integer, options: { limit: limit } }
+    define_model :example, attribute => column_options do
+      validates_numericality_of attribute, validation_options
+    end.new
+  end
 end

data/spec/unit/shoulda/matchers/active_record/association_matcher_spec.rb

@@ -646,8 +646,28 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher, type: :model do
     end
 
     it 'accepts an association with a valid :dependent option' do
-      expect(having_one_detail(dependent: :destroy)).
-        to have_one(:detail).dependent(:destroy)
+      dependent_options.each do |option|
+        expect(having_one_detail(dependent: option)).
+          to have_one(:detail).dependent(option)
+      end
+    end
+
+    it 'accepts any dependent option if true' do
+      dependent_options.each do |option|
+        expect(having_one_detail(dependent: option)).
+          to have_one(:detail).dependent(true)
+      end
+    end
+
+    it 'rejects any dependent options if false' do
+      dependent_options.each do |option|
+        expect(having_one_detail(dependent: option)).
+          to_not have_one(:detail).dependent(false)
+      end
+    end
+
+    it 'accepts a nil dependent option if false' do
+      expect(having_one_detail).to have_one(:detail).dependent(false)
     end
 
     it 'rejects an association with a bad :dependent option' do
@@ -1117,4 +1137,13 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher, type: :model do
     args << options
     model.__send__(macro, name, *args)
   end
+
+  def dependent_options
+    case Rails.version
+    when /\A3/
+      [:destroy, :delete, :nullify, :restrict]
+    when /\A4/
+      [:destroy, :delete, :nullify, :restrict_with_exception, :restrict_with_error]
+    end
+  end
 end

data/spec/unit_spec_helper.rb

@@ -58,6 +58,8 @@ RSpec.configure do |config|
   UnitTests::MailerBuilder.configure_example_group(config)
   UnitTests::ModelBuilder.configure_example_group(config)
   UnitTests::RailsVersions.configure_example_group(config)
+  UnitTests::ActiveRecordVersions.configure_example_group(config)
+  UnitTests::ActiveModelVersions.configure_example_group(config)
 
   config.include UnitTests::Matchers
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 2.8.0.rc1
+  version: 2.8.0.rc2
 platform: ruby
 authors:
 - Tammer Saleh
@@ -10,10 +10,11 @@ authors:
 - Dan Croak
 - Matt Jankowski
 - Stafford Brunk
+- Elliot Winkler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-25 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -36,6 +37,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
+- ".hound_config/ruby.yml"
 - ".travis.yml"
 - ".yardopts"
 - Appraisals
@@ -108,7 +111,6 @@ files:
 - lib/shoulda/matchers/active_model/allow_value_matcher.rb
 - lib/shoulda/matchers/active_model/disallow_value_matcher.rb
 - lib/shoulda/matchers/active_model/errors.rb
-- lib/shoulda/matchers/active_model/exception_message_finder.rb
 - lib/shoulda/matchers/active_model/have_secure_password_matcher.rb
 - lib/shoulda/matchers/active_model/helpers.rb
 - lib/shoulda/matchers/active_model/numericality_matchers.rb
@@ -117,6 +119,7 @@ files:
 - lib/shoulda/matchers/active_model/numericality_matchers/numeric_type_matcher.rb
 - lib/shoulda/matchers/active_model/numericality_matchers/odd_number_matcher.rb
 - lib/shoulda/matchers/active_model/numericality_matchers/only_integer_matcher.rb
+- lib/shoulda/matchers/active_model/strict_validator.rb
 - lib/shoulda/matchers/active_model/validate_absence_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_acceptance_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_confirmation_of_matcher.rb
@@ -126,7 +129,8 @@ files:
 - lib/shoulda/matchers/active_model/validate_numericality_of_matcher.rb
 - lib/shoulda/matchers/active_model/validate_presence_of_matcher.rb
 - lib/shoulda/matchers/active_model/validation_matcher.rb
-- lib/shoulda/matchers/active_model/validation_message_finder.rb
+- lib/shoulda/matchers/active_model/validator.rb
+- lib/shoulda/matchers/active_model/validator_with_captured_range_error.rb
 - lib/shoulda/matchers/active_record.rb
 - lib/shoulda/matchers/active_record/accept_nested_attributes_for_matcher.rb
 - lib/shoulda/matchers/active_record/association_matcher.rb
@@ -178,6 +182,7 @@ files:
 - script/SUPPORTED_VERSIONS
 - script/install_gems_in_all_appraisals
 - script/run_all_tests
+- script/update_gem_in_all_appraisals
 - shoulda-matchers.gemspec
 - spec/acceptance/active_model_integration_spec.rb
 - spec/acceptance/independent_matchers_spec.rb
@@ -207,6 +212,7 @@ files:
 - spec/support/unit/capture.rb
 - spec/support/unit/helpers/active_model_helpers.rb
 - spec/support/unit/helpers/active_model_versions.rb
+- spec/support/unit/helpers/active_record_versions.rb
 - spec/support/unit/helpers/active_resource_builder.rb
 - spec/support/unit/helpers/allow_value_matcher_helpers.rb
 - spec/support/unit/helpers/class_builder.rb
@@ -242,7 +248,6 @@ files:
 - spec/unit/shoulda/matchers/active_model/allow_mass_assignment_of_matcher_spec.rb
 - spec/unit/shoulda/matchers/active_model/allow_value_matcher_spec.rb
 - spec/unit/shoulda/matchers/active_model/disallow_value_matcher_spec.rb
-- spec/unit/shoulda/matchers/active_model/exception_message_finder_spec.rb
 - spec/unit/shoulda/matchers/active_model/have_secure_password_matcher_spec.rb
 - spec/unit/shoulda/matchers/active_model/helpers_spec.rb
 - spec/unit/shoulda/matchers/active_model/numericality_matchers/comparison_matcher_spec.rb
@@ -258,7 +263,6 @@ files:
 - spec/unit/shoulda/matchers/active_model/validate_numericality_of_matcher_spec.rb
 - spec/unit/shoulda/matchers/active_model/validate_presence_of_matcher_spec.rb
 - spec/unit/shoulda/matchers/active_model/validate_uniqueness_of_matcher_spec.rb
-- spec/unit/shoulda/matchers/active_model/validation_message_finder_spec.rb
 - spec/unit/shoulda/matchers/active_record/accept_nested_attributes_for_matcher_spec.rb
 - spec/unit/shoulda/matchers/active_record/association_matcher_spec.rb
 - spec/unit/shoulda/matchers/active_record/association_matchers/model_reflection_spec.rb
@@ -336,6 +340,7 @@ test_files:
 - spec/support/unit/capture.rb
 - spec/support/unit/helpers/active_model_helpers.rb
 - spec/support/unit/helpers/active_model_versions.rb
+- spec/support/unit/helpers/active_record_versions.rb
 - spec/support/unit/helpers/active_resource_builder.rb
 - spec/support/unit/helpers/allow_value_matcher_helpers.rb
 - spec/support/unit/helpers/class_builder.rb
@@ -371,7 +376,6 @@ test_files:
 - spec/unit/shoulda/matchers/active_model/allow_mass_assignment_of_matcher_spec.rb
 - spec/unit/shoulda/matchers/active_model/allow_value_matcher_spec.rb
 - spec/unit/shoulda/matchers/active_model/disallow_value_matcher_spec.rb
-- spec/unit/shoulda/matchers/active_model/exception_message_finder_spec.rb
 - spec/unit/shoulda/matchers/active_model/have_secure_password_matcher_spec.rb
 - spec/unit/shoulda/matchers/active_model/helpers_spec.rb
 - spec/unit/shoulda/matchers/active_model/numericality_matchers/comparison_matcher_spec.rb
@@ -387,7 +391,6 @@ test_files:
 - spec/unit/shoulda/matchers/active_model/validate_numericality_of_matcher_spec.rb
 - spec/unit/shoulda/matchers/active_model/validate_presence_of_matcher_spec.rb
 - spec/unit/shoulda/matchers/active_model/validate_uniqueness_of_matcher_spec.rb
-- spec/unit/shoulda/matchers/active_model/validation_message_finder_spec.rb
 - spec/unit/shoulda/matchers/active_record/accept_nested_attributes_for_matcher_spec.rb
 - spec/unit/shoulda/matchers/active_record/association_matcher_spec.rb
 - spec/unit/shoulda/matchers/active_record/association_matchers/model_reflection_spec.rb

data/lib/shoulda/matchers/active_model/exception_message_finder.rb

@@ -1,58 +0,0 @@
-module Shoulda
-  module Matchers
-    module ActiveModel
-      # @private
-      class ExceptionMessageFinder
-        def initialize(instance, attribute, context=nil)
-          @instance = instance
-          @attribute = attribute
-          @context = context
-        end
-
-        def allow_description(allowed_values)
-          "doesn't raise when #{@attribute} is set to #{allowed_values}"
-        end
-
-        def messages_description
-          if has_messages?
-            ": #{messages.join.inspect}"
-          else
-            ' no exception'
-          end
-        end
-
-        def has_messages?
-          messages.any?
-        end
-
-        def messages
-          @messages ||= validate_and_rescue
-        end
-
-        def source_description
-          'exception'
-        end
-
-        def expected_message_from(attribute_message)
-          "#{human_attribute_name} #{attribute_message}"
-        end
-
-        private
-
-        def validate_and_rescue
-          @instance.valid?(@context)
-          []
-        rescue ::ActiveModel::StrictValidationFailed => exception
-          [exception.message]
-        end
-
-        def human_attribute_name
-          @instance.class.human_attribute_name(@attribute)
-        end
-      end
-
-    end
-  end
-end
-
-

data/lib/shoulda/matchers/active_model/validation_message_finder.rb

@@ -1,69 +0,0 @@
-module Shoulda
-  module Matchers
-    module ActiveModel
-      # @private
-      class ValidationMessageFinder
-        include Helpers
-
-        def initialize(instance, attribute, context=nil)
-          @instance = instance
-          @attribute = attribute
-          @context = context
-        end
-
-        def allow_description(allowed_values)
-          "allow #{@attribute} to be set to #{allowed_values}"
-        end
-
-        def expected_message_from(attribute_message)
-          attribute_message
-        end
-
-        def has_messages?
-          errors.present?
-        end
-
-        def source_description
-          'errors'
-        end
-
-        def messages_description
-          if errors.empty?
-            ' no errors'
-          else
-            " errors:\n#{pretty_error_messages(validated_instance)}"
-          end
-        end
-
-        def messages
-          Array(messages_for_attribute)
-        end
-
-        private
-
-        def messages_for_attribute
-          if errors.respond_to?(:[])
-            errors[@attribute]
-          else
-            errors.on(@attribute)
-          end
-        end
-
-        def errors
-          validated_instance.errors
-        end
-
-        def validated_instance
-          @validated_instance ||= validate_instance
-        end
-
-        def validate_instance
-          @instance.valid?(*@context)
-          @instance
-        end
-      end
-
-    end
-  end
-end
-

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

@@ -1,111 +0,0 @@
-require 'unit_spec_helper'
-
-describe Shoulda::Matchers::ActiveModel::ExceptionMessageFinder, type: :model do
-  if active_model_3_2?
-    context '#allow_description' do
-      it 'describes its attribute' do
-        finder = build_finder(attribute: :attr)
-
-        description = finder.allow_description('allowed values')
-
-        expect(description).to eq %q(doesn't raise when attr is set to allowed values)
-      end
-    end
-
-    context '#expected_message_from' do
-      it 'returns the message with the attribute name prefixed' do
-        finder = build_finder(attribute: :attr)
-
-        message = finder.expected_message_from('some message')
-
-        expect(message).to eq 'Attr some message'
-      end
-    end
-
-    context '#has_messages?' do
-      it 'has messages when some validations fail' do
-        finder = build_finder(format: /abc/, value: 'xyz')
-
-        result = finder.has_messages?
-
-        expect(result).to eq true
-      end
-
-      it 'has no messages when all validations pass' do
-        finder = build_finder(format: /abc/, value: 'abc')
-
-        result = finder.has_messages?
-
-        expect(result).to eq false
-      end
-    end
-
-    context '#messages' do
-      it 'returns errors for the given attribute' do
-        finder = build_finder(
-          attribute: :attr,
-          format: /abc/,
-          value: 'xyz'
-        )
-
-        messages = finder.messages
-
-        expect(messages).to eq ['Attr is invalid']
-      end
-    end
-
-    context '#messages_description' do
-      it 'describes errors for the given attribute' do
-        finder = build_finder(
-          attribute: :attr,
-          format: /abc/,
-          value: 'xyz'
-        )
-
-        description = finder.messages_description
-
-        expect(description).to eq ': "Attr is invalid"'
-      end
-
-      it 'describes errors when there are none' do
-        finder = build_finder(format: /abc/, value: 'abc')
-
-        description = finder.messages_description
-
-        expect(description).to eq ' no exception'
-      end
-    end
-
-    context '#source_description' do
-      it 'describes the source of its messages' do
-        finder = build_finder
-
-        description = finder.source_description
-
-        expect(description).to eq 'exception'
-      end
-    end
-  end
-
-  def build_finder(arguments = {})
-    arguments[:attribute] ||= :attr
-    instance = build_instance_validating(
-      arguments[:attribute],
-      arguments[:format] || /abc/,
-      arguments[:value] || 'abc'
-    )
-    Shoulda::Matchers::ActiveModel::ExceptionMessageFinder.new(
-      instance,
-      arguments[:attribute]
-    )
-  end
-
-  def build_instance_validating(attribute, format, value)
-    model_class = define_model(:example, attribute => :string) do
-      attr_accessible attribute
-      validates_format_of attribute, with: format, strict: true
-    end
-
-    model_class.new(attribute => value)
-  end
-end