mongoid-rspec 3.0.0 → 4.1.0

data/lib/matchers/validations/confirmation_of.rb

@@ -2,16 +2,9 @@ module Mongoid
   module Matchers
     module Validations
       class ValidateConfirmationOfMatcher < HaveValidationMatcher
-        include WithMessage
-
         def initialize(name)
           super(name, :confirmation)
         end
-
-        def with_message(message)
-          @expected_message = message
-          self
-        end
       end
 
       def validate_confirmation_of(field)

data/lib/matchers/validations/custom_validation_of.rb

@@ -2,7 +2,6 @@ module Mongoid
   module Matchers
     module Validations
       class ValidateWithCustomValidatorMatcher < HaveValidationMatcher
-        include WithMessage
         def initialize(field)
           super(field, :custom)
         end
@@ -15,7 +14,6 @@ module Mongoid
         def matches?(actual)
           return false unless (@result = super(actual))
           check_custom_validator if @custom_validator
-          check_expected_message if @expected_message
 
           @result
         end
@@ -23,14 +21,13 @@ module Mongoid
         def description
           options_desc = []
           options_desc << " with custom validator #{@custom_validator.name}" if @validator
-          options_desc << " with message '#{@expected_message}'" if @expected_message
           "validate field #{@field.inspect}" << options_desc.to_sentence
         end
 
         private
 
         def check_custom_validator
-          if @validator.kind_of? @custom_validator
+          if @validator.is_a? @custom_validator
             @positive_result_message << " with custom validator of type #{@custom_validator.name}"
           else
             @negative_result_message << " with custom validator not of type #{@custom_validator.name}"

data/lib/matchers/validations/exclusion_of.rb

@@ -18,13 +18,13 @@ module Mongoid
             raw_validator_not_allowed_values = @validator.options[:in]
 
             validator_not_allowed_values = case raw_validator_not_allowed_values
-            when Range then raw_validator_not_allowed_values.to_a
-            when Proc then raw_validator_not_allowed_values.call(actual)
-            else raw_validator_not_allowed_values end
+                                           when Range then raw_validator_not_allowed_values.to_a
+                                           when Proc then raw_validator_not_allowed_values.call(actual)
+                                           else raw_validator_not_allowed_values end
 
             allowed_values = @not_allowed_values - validator_not_allowed_values
             if allowed_values.empty?
-              @positive_result_message = @positive_result_message << " not allowing all values mentioned"
+              @positive_result_message = @positive_result_message << ' not allowing all values mentioned'
             else
               @negative_result_message = @negative_result_message << " allowing the following the ff. values: #{allowed_values.inspect}"
               result = false
@@ -46,4 +46,4 @@ module Mongoid
       end
     end
   end
-end
+end

data/lib/matchers/validations/format_of.rb

@@ -43,7 +43,7 @@ module Mongoid
           end
 
           if @invalid_value
-            if !(@invalid_value =~ @validator.options[:with])
+            if @invalid_value !~ @validator.options[:with]
               @positive_result_message = @positive_result_message << " with #{@invalid_value.inspect} as an invalid value"
             else
               @negative_result_message = @negative_result_message << " with #{@invalid_value.inspect} as a valid value"
@@ -68,4 +68,4 @@ module Mongoid
       end
     end
   end
-end
+end

data/lib/matchers/validations/inclusion_of.rb

@@ -18,13 +18,13 @@ module Mongoid
             raw_validator_allowed_values = @validator.options[:in]
 
             validator_allowed_values = case raw_validator_allowed_values
-            when Range then raw_validator_allowed_values.to_a
-            when Proc then raw_validator_allowed_values.call(actual)
-            else raw_validator_allowed_values end
+                                       when Range then raw_validator_allowed_values.to_a
+                                       when Proc then raw_validator_allowed_values.call(actual)
+                                       else raw_validator_allowed_values end
 
             not_allowed_values = @allowed_values - validator_allowed_values
             if not_allowed_values.empty?
-              @positive_result_message = @positive_result_message << " allowing all values mentioned"
+              @positive_result_message = @positive_result_message << ' allowing all values mentioned'
             else
               @negative_result_message = @negative_result_message << " not allowing these values: #{not_allowed_values.inspect}"
               result = false
@@ -46,4 +46,4 @@ module Mongoid
       end
     end
   end
-end
+end

data/lib/matchers/validations/length_of.rb

@@ -2,8 +2,6 @@ module Mongoid
   module Matchers
     module Validations
       class ValidateLengthOfMatcher < HaveValidationMatcher
-        include WithMessage
-
         def initialize(name)
           super(name, :length)
         end
@@ -12,30 +10,25 @@ module Mongoid
           @maximum = value
           self
         end
-        alias :less_than :with_maximum
+        alias less_than with_maximum
 
         def with_minimum(value)
           @minimum = value
           self
         end
-        alias :greater_than :with_minimum
+        alias greater_than with_minimum
 
         def within(value)
           @within = value
           self
         end
-        alias :in :within
+        alias in within
 
         def as_exactly(value)
           @is = value
           self
         end
-        alias :is :as_exactly
-
-        def with_message(message)
-          @expected_message = message
-          self
-        end
+        alias is as_exactly
 
         def matches?(actual)
           return false unless @result = super(actual)
@@ -44,7 +37,6 @@ module Mongoid
           check_minimum if @minimum
           check_range if @within
           check_exact if @is
-          check_expected_message if @expected_message
 
           @result
         end
@@ -55,7 +47,6 @@ module Mongoid
           options_desc << "with maximum of #{@maximum}" if @maximum
           options_desc << "within the range of #{@within}" if @within
           options_desc << "as exactly #{@is}" if @is
-          options_desc << "with message '#{@expected_message}'" if @expected_message
           super << " #{options_desc.to_sentence}"
         end
 
@@ -63,7 +54,7 @@ module Mongoid
 
         def check_maximum
           if actual_max.nil?
-            @negative_result_message << " with no maximum"
+            @negative_result_message << ' with no maximum'
             @result = false
           elsif actual_max == @maximum
             @positive_result_message << " with maximum of #{@maximum}"
@@ -75,7 +66,7 @@ module Mongoid
 
         def check_minimum
           if actual_min.nil?
-            @negative_result_message << " with no minimum"
+            @negative_result_message << ' with no minimum'
             @result = false
           elsif actual_min == @minimum
             @positive_result_message << " with minimum of #{@minimum}"
@@ -86,15 +77,15 @@ module Mongoid
         end
 
         def check_range
-          min, max = [@within.min, @within.max]
-          if !actual_min.nil? and actual_max.nil?
+          min, max = @within.minmax
+          if !actual_min.nil? && actual_max.nil?
             @negative_result_message << " with no minimum but with maximum of #{actual_max}"
             @result = false
-          elsif actual_min.nil? and !actual_max.nil?
+          elsif actual_min.nil? && !actual_max.nil?
             @negative_result_message << " with minimum_of #{actual_min} but no maximum"
             @result = false
-          elsif actual_min.nil? and actual_max.nil?
-            @negative_result_message << " with no minimum and maximum"
+          elsif actual_min.nil? && actual_max.nil?
+            @negative_result_message << ' with no minimum and maximum'
             @result = false
           elsif actual_min == min && actual_max == max
             @positive_result_message << " within the range of #{@within.inspect}"
@@ -113,29 +104,16 @@ module Mongoid
           end
         end
 
-        def check_expected_message
-          actual_message = @validator.options[:message]
-          if actual_message.nil?
-            @negative_result_message << " with no custom message"
-            @result = false
-          elsif actual_message == @expected_message
-            @positive_result_message << " with custom message '#{@expected_message}'"
-          else
-            @negative_result_message << " got message '#{actual_message}'"
-            @result = false
-          end
-        end
-
         def actual_is
           actual_is = @validator.options[:is]
         end
 
         def actual_min
-          @validator.options[:minimum] || ((@validator.options[:in] || @validator.options[:within]).try(&:min))
+          @validator.options[:minimum] || (@validator.options[:in] || @validator.options[:within]).try(&:min)
         end
 
         def actual_max
-          @validator.options[:maximum] || ((@validator.options[:in] || @validator.options[:within]).try(&:max))
+          @validator.options[:maximum] || (@validator.options[:in] || @validator.options[:within]).try(&:max)
         end
       end
 

data/lib/matchers/validations/numericality_of.rb

@@ -2,8 +2,19 @@ module Mongoid
   module Matchers
     module Validations
       class ValidateNumericalityOfMatcher < HaveValidationMatcher
-        @@allowed_options = [:equal_to, :greater_than, :greater_than_or_equal_to, :less_than, :less_than_or_equal_to,
-          :even, :odd, :only_integer, :allow_nil, :nil]
+        ALLOWED_OPTIONS =
+          %i[
+            allow_nil
+            equal_to
+            even
+            greater_than
+            greater_than_or_equal_to
+            less_than
+            less_than_or_equal_to
+            nil
+            odd
+            only_integer
+          ].freeze
 
         def initialize(field)
           super(field, :numericality)
@@ -12,9 +23,15 @@ module Mongoid
 
         def to_allow(options)
           options[:equal_to] = options if options.is_a?(Numeric)
-          options[:allow_nil] = options.delete(:nil) if options.has_key?(:nil)
-          raise ArgumentError, "validate_numericality_of#to_allow requires a Hash parameter containing any of the following keys: " <<
-            @@allowed_options.map(&:inspect).join(", ") if !options.is_a?(Hash) or options.empty? or (options.keys - @@allowed_options).any?
+          options[:allow_nil] = options.delete(:nil) if options.key?(:nil)
+
+          if !options.is_a?(Hash) || options.empty? || (options.keys - ALLOWED_OPTIONS).any?
+            message =
+              'validate_numericality_of#to_allow requires a Hash parameter containing' \
+              "any of the following keys: #{ALLOWED_OPTIONS.map(&:inspect).join(', ')}"
+            raise ArgumentError, message
+          end
+
           @options.merge!(options)
           self
         end
@@ -22,11 +39,10 @@ module Mongoid
         def matches?(actual)
           return false unless result = super(actual)
 
-          @@allowed_options.each do |comparator|
-            if @options.has_key?(comparator) and !([:even, :odd, :only_integer].include?(comparator) and !@validator.options.include?(comparator))
-              result &= (@validator.options[comparator] == @options[comparator])
-            end
+          @options.each do |comparator, expected_value|
+            result &= (@validator.options[comparator] == expected_value)
           end
+
           @positive_result_message <<= options_message(@validator.options)
           @negative_result_message <<= options_message(@validator.options)
           result
@@ -45,19 +61,19 @@ module Mongoid
             case key
             when :allow_nil
             when :only_integer
-              type_msg << "integer" if value
+              type_msg << 'integer' if value
             when :odd, :even
-              type_msg << "#{key.to_s}-numbered" if value
+              type_msg << "#{key}-numbered" if value
             else
-              comp_msg << "#{key.to_s.gsub("_", " ")} #{value.inspect}"
+              comp_msg << "#{key.to_s.tr('_', ' ')} #{value.inspect}"
             end
           end
-          allow_nil = (options[:allow_nil] ? "nil" : "non-nil") if options.has_key?(:allow_nil)
-          ["", "allowing", allow_nil, type_msg.any? ? type_msg.to_sentence : nil, "values", comp_msg.any? ? comp_msg.to_sentence : nil].compact.join(" ")
+          allow_nil = (options[:allow_nil] ? 'nil' : 'non-nil') if options.key?(:allow_nil)
+          ['', 'allowing', allow_nil, type_msg.any? ? type_msg.to_sentence : nil, 'values', comp_msg.any? ? comp_msg.to_sentence : nil].compact.join(' ')
         end
 
         def method_missing(m, *args, &block)
-          if @@allowed_options.include?(m.to_sym)
+          if ALLOWED_OPTIONS.include?(m.to_sym)
             raise ArgumentError, "wrong number of arguments (#{args.length} for 1)" if args.length > 1
             send :to_allow, m.to_sym => args.first
           else
@@ -71,4 +87,4 @@ module Mongoid
       end
     end
   end
-end
+end

data/lib/matchers/validations/presence_of.rb

@@ -6,4 +6,4 @@ module Mongoid
       end
     end
   end
-end
+end

data/lib/matchers/validations/uniqueness_of.rb

@@ -2,7 +2,6 @@ module Mongoid
   module Matchers
     module Validations
       class ValidateUniquenessOfMatcher < HaveValidationMatcher
-        include WithMessage
         def initialize(field)
           super(field, :uniqueness)
         end
@@ -11,7 +10,7 @@ module Mongoid
           @scope = [scope].flatten.map(&:to_sym)
           self
         end
-        alias_method :scoped_on, :scoped_to
+        alias scoped_on scoped_to
 
         def case_insensitive
           @case_insensitive = true
@@ -29,7 +28,6 @@ module Mongoid
           check_scope if @scope
           check_allow_blank if @allow_blank
           check_case_sensitivity if @case_insensitive
-          check_expected_message if @expected_message
 
           @result
         end
@@ -37,9 +35,8 @@ module Mongoid
         def description
           options_desc = []
           options_desc << " scoped to #{@scope.inspect}" if @scope
-          options_desc << " allowing blank values" if @allow_blank
-          options_desc << " allowing case insensitive values" if @case_insensitive
-          options_desc << " with message '#{@expected_message}'" if @expected_message
+          options_desc << ' allowing blank values' if @allow_blank
+          options_desc << ' allowing case insensitive values' if @case_insensitive
           super << options_desc.to_sentence
         end
 
@@ -47,9 +44,9 @@ module Mongoid
 
         def check_allow_blank
           if @validator.options[:allow_blank] == @allow_blank
-            @positive_result_message << " with blank values allowed"
+            @positive_result_message << ' with blank values allowed'
           else
-            @negative_result_message << " with no blank values allowed"
+            @negative_result_message << ' with no blank values allowed'
             @result = false
           end
         end
@@ -66,9 +63,9 @@ module Mongoid
 
         def check_case_sensitivity
           if @validator.options[:case_sensitive] == false
-            @positive_result_message << " with case insensitive values"
+            @positive_result_message << ' with case insensitive values'
           else
-            @negative_result_message << " without case insensitive values"
+            @negative_result_message << ' without case insensitive values'
             @result = false
           end
         end

data/lib/matchers/validations.rb

@@ -1,9 +1,7 @@
 module Mongoid
   module Matchers
     module Validations
-
       class HaveValidationMatcher
-
         def initialize(field, validation_type)
           @field = field.to_s
           @type = validation_type.to_s
@@ -13,9 +11,9 @@ module Mongoid
         def matches?(actual)
           @klass = actual.is_a?(Class) ? actual : actual.class
 
-          @validator = @klass.validators_on(@field).detect{ |v|
-            v.kind.to_s == @type and (!v.options[:on] or on_options_matches?(v))
-          }
+          @validator = @klass.validators_on(@field).detect do |v|
+            (v.kind.to_s == @type) && (!v.options[:on] || on_options_matches?(v))
+          end
 
           if @validator
             @negative_result_message = "#{@type.inspect} validator on #{@field.inspect}"
@@ -26,6 +24,7 @@ module Mongoid
           end
           @result = true
           check_on if @options[:on]
+          check_expected_message if @expected_message
           @result
         end
 
@@ -37,12 +36,14 @@ module Mongoid
           "Expected #{@klass.inspect} to not #{description}; instead got #{@positive_result_message}"
         end
 
-        alias :failure_message :failure_message_for_should
-        alias :failure_message_when_negated :failure_message_for_should_not
+        alias failure_message failure_message_for_should
+        alias failure_message_when_negated failure_message_for_should_not
 
         def description
           desc = "have #{@type.inspect} validator on #{@field.inspect}"
           desc << " on #{@options[:on]}" if @options[:on]
+          desc << " with message #{@expected_message.inspect}" if @expected_message
+
           desc
         end
 
@@ -51,13 +52,20 @@ module Mongoid
           self
         end
 
+        def with_message(message)
+          @expected_message = message
+          self
+        end
+
+        private
+
         def check_on
           validator_on_methods = [@validator.options[:on]].flatten
 
           if validator_on_methods.any?
             message = " on methods: #{validator_on_methods}"
 
-            if on_options_covered_by?( @validator )
+            if on_options_covered_by?(@validator)
               @positive_result_message << message
             else
               @negative_result_message << message
@@ -66,15 +74,26 @@ module Mongoid
           end
         end
 
-        private
-
         def on_options_matches?(validator)
-          @options[:on] and validator.options[:on] and on_options_covered_by?(validator)
+          @options[:on] && validator.options[:on] && on_options_covered_by?(validator)
         end
 
         def on_options_covered_by?(validator)
           ([@options[:on]].flatten - [validator.options[:on]].flatten).empty?
         end
+
+        def check_expected_message
+          actual_message = @validator.options[:message]
+          if actual_message.nil?
+            @negative_result_message << ' with no custom message'
+            @result = false
+          elsif actual_message == @expected_message
+            @positive_result_message << " with custom message '#{@expected_message}'"
+          else
+            @negative_result_message << " got message '#{actual_message}'"
+            @result = false
+          end
+        end
       end
     end
   end

data/lib/mongoid/rspec/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
-  module Rspec
-    VERSION = '3.0.0'
+  module RSpec
+    VERSION = '4.1.0'.freeze
   end
 end

data/lib/mongoid/rspec.rb

@@ -1,18 +1,19 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'mongoid'
+require 'mongoid-compatibility'
 require 'rspec/core'
 require 'rspec/expectations'
 require 'rspec/mocks'
-require "active_model"
-require 'matchers/document'
+require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/hash/transform_values' if Mongoid::Compatibility::Version.mongoid4_or_newer? && ActiveSupport.version < Gem::Version.new('6')
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/string/inflections'
+
 require 'matchers/associations'
-require 'matchers/collections'
-require 'matchers/indexes'
 require 'matchers/allow_mass_assignment'
 require 'matchers/accept_nested_attributes'
 require 'matchers/validations'
-require 'matchers/validations/with_message'
 require 'matchers/validations/associated'
 require 'matchers/validations/confirmation_of'
 require 'matchers/validations/exclusion_of'
@@ -24,6 +25,18 @@ require 'matchers/validations/presence_of'
 require 'matchers/validations/uniqueness_of'
 require 'matchers/validations/acceptance_of'
 require 'matchers/validations/custom_validation_of'
+require 'matchers/validations/absence_of'
+require 'matchers/be_mongoid_document'
+require 'matchers/be_dynamic_document'
+require 'matchers/be_stored_in'
+require 'matchers/have_field'
+require 'matchers/indexes/have_index_for'
+if Mongoid::Compatibility::Version.mongoid3?
+  require 'matchers/indexes/v3/have_index_for'
+else
+  require 'matchers/indexes/v4/have_index_for'
+end
+require 'matchers/have_timestamps'
 
 module Mongoid
   module Matchers

data/spec/models/article.rb

@@ -8,22 +8,25 @@ class Article
   field :allow_comments, type: Boolean, default: true
   field :number_of_comments, type: Integer
   field :status, type: Symbol
+  field :deletion_date, type: DateTime, default: nil
 
-  embeds_many :comments, cascade_callbacks: true
-  embeds_one :permalink
+  embeds_many :comments, cascade_callbacks: true, inverse_of: :article
+  embeds_one :permalink, inverse_of: :linkable
   belongs_to :author, class_name: 'User', inverse_of: :articles, index: true
 
   validates :title, presence: true
 
   validates_inclusion_of :status, in: [:pending], on: :create
-  validates_inclusion_of :status, in: [:approved, :rejected ], on: :update
+  validates_inclusion_of :status, in: %i[approved rejected], on: :update
 
   validates_length_of :title, within: 8..16
   validates_length_of :content, minimum: 200
 
-  index({ title: 1 }, { unique: true, background: true, drop_dups: true })
-  index({ published: 1 })
-  index({ 'permalink._id' => 1 })
+  validates_absence_of :deletion_date if Mongoid::Compatibility::Version.mongoid4_or_newer?
+
+  index({ title: 1 }, unique: true, background: true, drop_dups: true)
+  index(published: 1)
+  index('permalink._id' => 1)
 
   accepts_nested_attributes_for :permalink
 end

data/spec/models/comment.rb

@@ -3,4 +3,4 @@ class Comment
 
   embedded_in :article, inverse_of: :comments, polymorphic: true
   belongs_to :user, inverse_of: :comments
-end
+end

data/spec/models/log.rb

@@ -1,9 +1,9 @@
 class Log
   include Mongoid::Document
   include Mongoid::Timestamps
-  include Mongoid::Attributes::Dynamic
+  include Mongoid::Attributes::Dynamic if Mongoid::Compatibility::Version.mongoid4_or_newer?
 
-  store_in collection: "logs"
+  store_in collection: 'logs'
 
-  index({ created_at: 1 }, { bucket_size: 100, expire_after_seconds: 3600 } )
+  index({ created_at: 1 }, bucket_size: 100, expire_after_seconds: 3600)
 end

data/spec/models/message.rb

@@ -0,0 +1,17 @@
+class Message
+  include Mongoid::Document
+
+  field :identifier
+  field :from
+  field :to
+
+  if Mongoid::Compatibility::Version.mongoid6_or_newer?
+    belongs_to :user, optional: true
+  else
+    belongs_to :user
+  end
+
+  validates :identifier, uniqueness: { message: 'uniqueness' }
+  validates :from, presence: { message: 'required' }
+  validates :to, format: { with: /[a-z]+/, message: 'format' }
+end

data/spec/models/movie_article.rb

@@ -1,8 +1,7 @@
 class MovieArticle < Article
-
   field :rating, type: Float
   field :classification, type: Integer
 
   validates :rating, numericality: { greater_than: 0, less_than_or_equal_to: 5 }
   validates :classification, numericality: { even: true, only_integer: true, allow_nil: false }
-end
+end

data/spec/models/person.rb

@@ -7,4 +7,4 @@ class Person
   field :ssn
 
   validates :ssn, ssn: true
-end
+end

data/spec/models/profile.rb

@@ -10,7 +10,7 @@ class Profile
 
   validates :age, numericality: { greater_than: 0 }
   validates :terms_of_service, acceptance: true
-  validates :hobbies, length: { minimum: 1, message: "requires at least one hobby" }
+  validates :hobbies, length: { minimum: 1, message: 'requires at least one hobby' }
 
-  index({ first_name: 1, last_name: 1 })
+  index(first_name: 1, last_name: 1)
 end

data/spec/models/record.rb

@@ -2,4 +2,4 @@ class Record
   include Mongoid::Document
 
   belongs_to :user, inverse_of: :record
-end
+end