shoulda-matchers 4.3.0 → 4.4.0

data/lib/shoulda/matchers/active_model.rb

@@ -1,34 +1,9 @@
+require 'shoulda/matchers/active_model/allow_mass_assignment_of_matcher'
 require 'shoulda/matchers/active_model/helpers'
 require 'shoulda/matchers/active_model/qualifiers'
 require 'shoulda/matchers/active_model/validation_matcher'
-require 'shoulda/matchers/active_model/validation_matcher/build_description'
-require 'shoulda/matchers/active_model/validator'
-require 'shoulda/matchers/active_model/allow_value_matcher'
-require 'shoulda/matchers/active_model/allow_value_matcher/attribute_changed_value_error'
-require 'shoulda/matchers/active_model/allow_value_matcher/attribute_does_not_exist_error'
-require 'shoulda/matchers/active_model/allow_value_matcher/attribute_setter'
-require 'shoulda/matchers/active_model/allow_value_matcher/attribute_setter_and_validator'
-require 'shoulda/matchers/active_model/allow_value_matcher/attribute_setters'
-require 'shoulda/matchers/active_model/allow_value_matcher/attribute_setters_and_validators'
-require 'shoulda/matchers/active_model/allow_value_matcher/successful_check'
-require 'shoulda/matchers/active_model/allow_value_matcher/successful_setting'
-require 'shoulda/matchers/active_model/disallow_value_matcher'
-require 'shoulda/matchers/active_model/validate_length_of_matcher'
-require 'shoulda/matchers/active_model/validate_inclusion_of_matcher'
-require 'shoulda/matchers/active_model/validate_exclusion_of_matcher'
 require 'shoulda/matchers/active_model/validate_absence_of_matcher'
 require 'shoulda/matchers/active_model/validate_presence_of_matcher'
-require 'shoulda/matchers/active_model/validate_acceptance_of_matcher'
-require 'shoulda/matchers/active_model/validate_confirmation_of_matcher'
-require 'shoulda/matchers/active_model/validate_numericality_of_matcher'
-require 'shoulda/matchers/active_model/numericality_matchers/numeric_type_matcher'
-require 'shoulda/matchers/active_model/numericality_matchers/comparison_matcher'
-require 'shoulda/matchers/active_model/numericality_matchers/odd_number_matcher'
-require 'shoulda/matchers/active_model/numericality_matchers/even_number_matcher'
-require 'shoulda/matchers/active_model/numericality_matchers/only_integer_matcher'
-require 'shoulda/matchers/active_model/allow_mass_assignment_of_matcher'
-require 'shoulda/matchers/active_model/errors'
-require 'shoulda/matchers/active_model/have_secure_password_matcher'
 
 module Shoulda
   module Matchers
@@ -89,6 +64,20 @@ module Shoulda
     #     end
     #
     module ActiveModel
+      autoload :AllowValueMatcher, 'shoulda/matchers/active_model/allow_value_matcher'
+      autoload :CouldNotDetermineValueOutsideOfArray, 'shoulda/matchers/active_model/errors'
+      autoload :CouldNotSetPasswordError, 'shoulda/matchers/active_model/errors'
+      autoload :DisallowValueMatcher, 'shoulda/matchers/active_model/disallow_value_matcher'
+      autoload :HaveSecurePasswordMatcher, 'shoulda/matchers/active_model/have_secure_password_matcher'
+      autoload :NonNullableBooleanError, 'shoulda/matchers/active_model/errors'
+      autoload :NumericalityMatchers, 'shoulda/matchers/active_model/numericality_matchers'
+      autoload :ValidateAcceptanceOfMatcher, 'shoulda/matchers/active_model/validate_acceptance_of_matcher'
+      autoload :ValidateConfirmationOfMatcher, 'shoulda/matchers/active_model/validate_confirmation_of_matcher'
+      autoload :ValidateExclusionOfMatcher, 'shoulda/matchers/active_model/validate_exclusion_of_matcher'
+      autoload :ValidateInclusionOfMatcher, 'shoulda/matchers/active_model/validate_inclusion_of_matcher'
+      autoload :ValidateLengthOfMatcher, 'shoulda/matchers/active_model/validate_length_of_matcher'
+      autoload :ValidateNumericalityOfMatcher, 'shoulda/matchers/active_model/validate_numericality_of_matcher'
+      autoload :Validator, 'shoulda/matchers/active_model/validator'
     end
   end
 end

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

@@ -305,6 +305,15 @@ module Shoulda
 
       # @private
       class AllowValueMatcher
+        autoload :AttributeChangedValueError, 'shoulda/matchers/active_model/allow_value_matcher/attribute_changed_value_error'
+        autoload :AttributeDoesNotExistError, 'shoulda/matchers/active_model/allow_value_matcher/attribute_does_not_exist_error'
+        autoload :AttributeSetter,  'shoulda/matchers/active_model/allow_value_matcher/attribute_setter'
+        autoload :AttributeSetterAndValidator, 'shoulda/matchers/active_model/allow_value_matcher/attribute_setter_and_validator'
+        autoload :AttributeSetters, 'shoulda/matchers/active_model/allow_value_matcher/attribute_setters'
+        autoload :AttributeSettersAndValidators, 'shoulda/matchers/active_model/allow_value_matcher/attribute_setters_and_validators'
+        autoload :SuccessfulCheck, 'shoulda/matchers/active_model/allow_value_matcher/successful_check'
+        autoload :SuccessfulSetting, 'shoulda/matchers/active_model/allow_value_matcher/successful_setting'
+
         include Helpers
         include Qualifiers::IgnoringInterferenceByWriter
 

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

@@ -3,6 +3,11 @@ module Shoulda
     module ActiveModel
       # @private
       module NumericalityMatchers
+        autoload :ComparisonMatcher,  'shoulda/matchers/active_model/numericality_matchers/comparison_matcher'
+        autoload :EvenNumberMatcher,  'shoulda/matchers/active_model/numericality_matchers/even_number_matcher'
+        autoload :NumericTypeMatcher, 'shoulda/matchers/active_model/numericality_matchers/numeric_type_matcher'
+        autoload :OddNumberMatcher,   'shoulda/matchers/active_model/numericality_matchers/odd_number_matcher'
+        autoload :OnlyIntegerMatcher, 'shoulda/matchers/active_model/numericality_matchers/only_integer_matcher'
       end
     end
   end

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

@@ -9,7 +9,8 @@ module Shoulda
             :>= => :greater_than_or_equal_to,
             :< => :less_than,
             :<= => :less_than_or_equal_to,
-            :== => :equal_to
+            :== => :equal_to,
+            :!= => :other_than,
           }
 
           def initialize(numericality_matcher, value, operator)
@@ -125,6 +126,8 @@ module Shoulda
               [true, false, false]
             when :<=
               [true, true, false]
+            when :!=
+               [true, false, true]
             end
           end
 
@@ -146,6 +149,7 @@ module Shoulda
               when :== then "equal to"
               when :< then "less than"
               when :<= then "less than or equal to"
+              when :!= then 'other than'
             end
           end
         end

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

@@ -311,15 +311,6 @@ EOT
           self
         end
 
-        def allow_blank
-          @options[:allow_blank] = true
-          self
-        end
-
-        def expects_to_allow_blank?
-          @options[:allow_blank]
-        end
-
         def allow_nil
           @options[:allow_nil] = true
           self
@@ -423,14 +414,14 @@ EOT
           allows_all_values_in_array? &&
             disallows_all_values_outside_of_array? &&
             allows_nil_value? &&
-            allows_blank_value?
+            allow_blank_matches?
         end
 
         def does_not_match_for_array?
           disallows_any_values_in_array? ||
             allows_any_value_outside_of_array? ||
             disallows_nil_value? ||
-            disallows_blank_value?
+            allow_blank_does_not_match?
         end
 
         def allows_lower_value
@@ -616,16 +607,6 @@ EOT
           @options[:allow_nil] && disallows_value_of(nil)
         end
 
-        def allows_blank_value?
-          @options[:allow_blank] != true ||
-            BLANK_VALUES.all? { |value| allows_value_of(value) }
-        end
-
-        def disallows_blank_value?
-          @options[:allow_blank] &&
-            BLANK_VALUES.any? { |value| disallows_value_of(value) }
-        end
-
         def inspected_array
           Shoulda::Matchers::Util.inspect_values(@array).to_sentence(
             two_words_connector: " or ",

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

@@ -232,13 +232,34 @@ module Shoulda
       #       it { should validate_length_of(:bio).is_at_least(15).allow_nil }
       #     end
       #
-      #     # Test::Unit
+      #     # Minitest (Shoulda)
       #     class UserTest < ActiveSupport::TestCase
       #       should validate_length_of(:bio).is_at_least(15).allow_nil
       #     end
       #
       # @return [ValidateLengthOfMatcher]
       #
+      # # ##### allow_blank
+      #
+      # Use `allow_blank` to assert that the attribute allows blank.
+      #
+      #     class User
+      #       include ActiveModel::Model
+      #       attr_accessor :bio
+      #
+      #       validates_length_of :bio, minimum: 15, allow_blank: true
+      #     end
+      #
+      #     # RSpec
+      #     describe User do
+      #       it { should validate_length_of(:bio).is_at_least(15).allow_blank }
+      #     end
+      #
+      #     # Minitest (Shoulda)
+      #     class UserTest < ActiveSupport::TestCase
+      #       should validate_length_of(:bio).is_at_least(15).allow_blank
+      #     end
+      #
       def validate_length_of(attr)
         ValidateLengthOfMatcher.new(attr)
       end
@@ -331,7 +352,8 @@ module Shoulda
 
           lower_bound_matches? &&
             upper_bound_matches? &&
-            allow_nil_matches?
+            allow_nil_matches? &&
+            allow_blank_matches?
         end
 
         def does_not_match?(subject)
@@ -339,7 +361,8 @@ module Shoulda
 
           lower_bound_does_not_match? ||
             upper_bound_does_not_match? ||
-            allow_nil_does_not_match?
+            allow_nil_does_not_match? ||
+            allow_blank_does_not_match?
         end
 
         private
@@ -376,6 +399,7 @@ module Shoulda
         def disallows_lower_length?
           !@options.key?(:minimum) ||
             @options[:minimum] == 0 ||
+            (@options[:minimum] == 1 && expects_to_allow_blank?) ||
             disallows_length_of?(
               @options[:minimum] - 1,
               translated_short_message

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

@@ -204,6 +204,33 @@ module Shoulda
       #         is_greater_than(21)
       #     end
       #
+      # ##### is_other_than
+      #
+      # Use `is_other_than` to test usage of the `:other_than` option.
+      # This asserts that the attribute can take a number which is not equal to
+      # the given value.
+      #
+      #     class Person
+      #       include ActiveModel::Model
+      #       attr_accessor :legal_age
+      #
+      #       validates_numericality_of :legal_age, other_than: 21
+      #     end
+      #
+      #     # RSpec
+      #     RSpec.describe Person, type: :model do
+      #       it do
+      #         should validate_numericality_of(:legal_age).
+      #           is_other_than(21)
+      #       end
+      #     end
+      #
+      #     # Minitest (Shoulda)
+      #     class PersonTest < ActiveSupport::TestCase
+      #       should validate_numericality_of(:legal_age).
+      #         is_other_than(21)
+      #     end
+      #
       # ##### even
       #
       # Use `even` to test usage of the `:even` option. This asserts that the
@@ -395,6 +422,11 @@ module Shoulda
           self
         end
 
+        def is_other_than(value)
+          prepare_submatcher(comparison_matcher_for(value, :!=).for(@attribute))
+          self
+        end
+
         def with_message(message)
           @expects_custom_validation_message = true
           @expected_message = message

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

@@ -3,6 +3,8 @@ module Shoulda
     module ActiveModel
       # @private
       class ValidationMatcher
+        autoload :BuildDescription, 'shoulda/matchers/active_model/validation_matcher/build_description'
+
         include Qualifiers::IgnoringInterferenceByWriter
 
         def initialize(attribute)
@@ -24,6 +26,11 @@ module Shoulda
           self
         end
 
+        def allow_blank
+          options[:allow_blank] = true
+          self
+        end
+
         def strict
           @expects_strict = true
           self
@@ -116,8 +123,20 @@ module Shoulda
           )
         end
 
+        def allow_blank_matches?
+          !expects_to_allow_blank? ||
+            blank_values.all? { |value| allows_value_of(value) }
+        end
+
+        def allow_blank_does_not_match?
+          expects_to_allow_blank? &&
+            blank_values.all? { |value| disallows_value_of(value) }
+        end
+
         private
 
+        attr_reader :options
+
         def overall_failure_message
           Shoulda::Matchers.word_wrap(
             "Expected #{model.name} to #{description}, but this could not be " +
@@ -161,6 +180,14 @@ module Shoulda
           @last_submatcher_run = matcher
           matcher.matches?(subject)
         end
+
+        def expects_to_allow_blank?
+          options[:allow_blank]
+        end
+
+        def blank_values
+          ['', ' ', "\n", "\r", "\t", "\f"]
+        end
       end
     end
   end

data/lib/shoulda/matchers/active_record.rb

@@ -1,26 +1,3 @@
-require "shoulda/matchers/active_record/association_matcher"
-require "shoulda/matchers/active_record/association_matchers"
-require "shoulda/matchers/active_record/association_matchers/counter_cache_matcher"
-require "shoulda/matchers/active_record/association_matchers/inverse_of_matcher"
-require "shoulda/matchers/active_record/association_matchers/join_table_matcher"
-require "shoulda/matchers/active_record/association_matchers/order_matcher"
-require "shoulda/matchers/active_record/association_matchers/through_matcher"
-require "shoulda/matchers/active_record/association_matchers/dependent_matcher"
-require "shoulda/matchers/active_record/association_matchers/required_matcher"
-require "shoulda/matchers/active_record/association_matchers/optional_matcher"
-require "shoulda/matchers/active_record/association_matchers/source_matcher"
-require "shoulda/matchers/active_record/association_matchers/model_reflector"
-require "shoulda/matchers/active_record/association_matchers/model_reflection"
-require "shoulda/matchers/active_record/association_matchers/option_verifier"
-require "shoulda/matchers/active_record/have_db_column_matcher"
-require "shoulda/matchers/active_record/have_db_index_matcher"
-require "shoulda/matchers/active_record/have_readonly_attribute_matcher"
-require "shoulda/matchers/active_record/have_rich_text_matcher"
-require "shoulda/matchers/active_record/have_secure_token_matcher"
-require "shoulda/matchers/active_record/serialize_matcher"
-require "shoulda/matchers/active_record/accept_nested_attributes_for_matcher"
-require "shoulda/matchers/active_record/define_enum_for_matcher"
-require "shoulda/matchers/active_record/uniqueness"
 require "shoulda/matchers/active_record/validate_uniqueness_of_matcher"
 
 module Shoulda
@@ -28,6 +5,19 @@ module Shoulda
     # This module provides matchers that are used to test behavior within
     # ActiveRecord classes.
     module ActiveRecord
+      autoload :AcceptNestedAttributesForMatcher, 'shoulda/matchers/active_record/accept_nested_attributes_for_matcher'
+      autoload :AssociationMatcher, 'shoulda/matchers/active_record/association_matcher'
+      autoload :AssociationMatchers, 'shoulda/matchers/active_record/association_matchers'
+      autoload :DefineEnumForMatcher, 'shoulda/matchers/active_record/define_enum_for_matcher'
+      autoload :HaveAttachedMatcher, 'shoulda/matchers/active_record/have_attached_matcher'
+      autoload :HaveDbColumnMatcher, 'shoulda/matchers/active_record/have_db_column_matcher'
+      autoload :HaveDbIndexMatcher, 'shoulda/matchers/active_record/have_db_index_matcher'
+      autoload :HaveImplicitOrderColumnMatcher, 'shoulda/matchers/active_record/have_implicit_order_column'
+      autoload :HaveReadonlyAttributeMatcher, 'shoulda/matchers/active_record/have_readonly_attribute_matcher'
+      autoload :HaveRichText, 'shoulda/matchers/active_record/have_rich_text_matcher'
+      autoload :HaveSecureTokenMatcher, 'shoulda/matchers/active_record/have_secure_token_matcher'
+      autoload :SerializeMatcher, 'shoulda/matchers/active_record/serialize_matcher'
+      autoload :Uniqueness, 'shoulda/matchers/active_record/uniqueness'
     end
   end
 end

data/lib/shoulda/matchers/active_record/association_matcher.rb

@@ -920,21 +920,21 @@ module Shoulda
       # asserts that the table you're referring to actually exists.
       #
       #     class Person < ActiveRecord::Base
-      #       has_and_belongs_to_many :issues, join_table: 'people_tickets'
+      #       has_and_belongs_to_many :issues, join_table: :people_tickets
       #     end
       #
       #     # RSpec
       #     RSpec.describe Person, type: :model do
       #       it do
       #         should have_and_belong_to_many(:issues).
-      #           join_table('people_tickets')
+      #           join_table(:people_tickets)
       #       end
       #     end
       #
       #     # Minitest (Shoulda)
       #     class PersonTest < ActiveSupport::TestCase
       #       should have_and_belong_to_many(:issues).
-      #         join_table('people_tickets')
+      #         join_table(:people_tickets)
       #     end
       #
       # ##### validate
@@ -1144,6 +1144,7 @@ module Shoulda
           @subject = subject
           association_exists? &&
             macro_correct? &&
+            validate_inverse_of_through_association &&
             (polymorphic? || class_exists?) &&
             foreign_key_exists? &&
             primary_key_exists? &&
@@ -1198,7 +1199,14 @@ module Shoulda
         end
 
         def expectation
-          "#{model_class.name} to have a #{macro} association called #{name}"
+          expectation =
+            "#{model_class.name} to have a #{macro} association called #{name}"
+
+          if through?
+            expectation << " through #{reflector.has_and_belongs_to_many_name}"
+          end
+
+          expectation
         end
 
         def missing_options
@@ -1241,6 +1249,14 @@ module Shoulda
           end
         end
 
+        def validate_inverse_of_through_association
+          reflector.validate_inverse_of_through_association!
+          true
+        rescue ::ActiveRecord::ActiveRecordError => error
+          @missing = error.message
+          false
+        end
+
         def macro_supports_primary_key?
           macro == :belongs_to ||
             ([:has_many, :has_one].include?(macro) && !through?)

data/lib/shoulda/matchers/active_record/association_matchers.rb

@@ -3,6 +3,18 @@ module Shoulda
     module ActiveRecord
       # @private
       module AssociationMatchers
+        autoload :CounterCacheMatcher, 'shoulda/matchers/active_record/association_matchers/counter_cache_matcher'
+        autoload :InverseOfMatcher, 'shoulda/matchers/active_record/association_matchers/inverse_of_matcher'
+        autoload :JoinTableMatcher, 'shoulda/matchers/active_record/association_matchers/join_table_matcher'
+        autoload :OrderMatcher, 'shoulda/matchers/active_record/association_matchers/order_matcher'
+        autoload :ThroughMatcher, 'shoulda/matchers/active_record/association_matchers/through_matcher'
+        autoload :DependentMatcher, 'shoulda/matchers/active_record/association_matchers/dependent_matcher'
+        autoload :RequiredMatcher, 'shoulda/matchers/active_record/association_matchers/required_matcher'
+        autoload :OptionalMatcher, 'shoulda/matchers/active_record/association_matchers/optional_matcher'
+        autoload :SourceMatcher, 'shoulda/matchers/active_record/association_matchers/source_matcher'
+        autoload :ModelReflector, 'shoulda/matchers/active_record/association_matchers/model_reflector'
+        autoload :ModelReflection, 'shoulda/matchers/active_record/association_matchers/model_reflection'
+        autoload :OptionVerifier, 'shoulda/matchers/active_record/association_matchers/option_verifier'
       end
     end
   end