mongoid-rspec 1.8.0 → 1.9.0

data/.travis.yml

@@ -1,4 +1,12 @@
 language: ruby
 rvm:
   - 1.9.3
-  - ruby-head
+  - 2.0.0
+  - ruby-head
+  - jruby-19mode
+  - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-19mode
+    - rvm: rbx-19mode

data/README.md

@@ -17,156 +17,181 @@ Add to your Gemfile
 
 Drop in existing or dedicated support file in spec/support (spec/support/mongoid.rb)
 
-    RSpec.configure do |configuration|
-      configuration.include Mongoid::Matchers
-    end
+```ruby
+RSpec.configure do |configuration|
+  configuration.include Mongoid::Matchers
+end
+```
 
 Association Matchers
 -
-    describe User do
-      it { should have_many(:articles).with_foreign_key(:author_id).ordered_by(:title) }
 
-      it { should have_one(:record) }
-      #can verify autobuild is set to true
-      it { should have_one(:record).with_autobuild }
+```ruby
+describe User do
+  it { should have_many(:articles).with_foreign_key(:author_id).ordered_by(:title) }
 
-      it { should have_many :comments }
+  it { should have_one(:record) }
+  #can verify autobuild is set to true
+  it { should have_one(:record).with_autobuild }
 
-      #can also specify with_dependent to test if :dependent => :destroy/:destroy_all/:delete is set
-      it { should have_many(:comments).with_dependent(:destroy) }
-      #can verify autosave is set to true
-      it { should have_many(:comments).with_autosave }
+  it { should have_many :comments }
 
-      it { should embed_one :profile }
+  #can also specify with_dependent to test if :dependent => :destroy/:destroy_all/:delete is set
+  it { should have_many(:comments).with_dependent(:destroy) }
+  #can verify autosave is set to true
+  it { should have_many(:comments).with_autosave }
 
-      it { should have_and_belong_to_many(:children) }
-      it { should have_and_belong_to_many(:children).of_type(User) }
-    end
+  it { should embed_one :profile }
 
-    describe Profile do
-      it { should be_embedded_in(:user).as_inverse_of(:profile) }
-    end
+  it { should have_and_belong_to_many(:children) }
+  it { should have_and_belong_to_many(:children).of_type(User) }
+end
 
-    describe Article do
-      it { should belong_to(:author).of_type(User).as_inverse_of(:articles) }
-      it { should belong_to(:author).of_type(User).as_inverse_of(:articles).with_index }
-      it { should embed_many(:comments) }
-    end
+describe Profile do
+  it { should be_embedded_in(:user).as_inverse_of(:profile) }
+end
 
-    describe Comment do
-      it { should be_embedded_in(:article).as_inverse_of(:comments) }
-      it { should belong_to(:user).as_inverse_of(:comments) }
-    end
+describe Article do
+  it { should belong_to(:author).of_type(User).as_inverse_of(:articles) }
+  it { should belong_to(:author).of_type(User).as_inverse_of(:articles).with_index }
+  it { should embed_many(:comments) }
+end
 
-    describe Record do
-      it { should belong_to(:user).as_inverse_of(:record) }
-    end
+describe Comment do
+  it { should be_embedded_in(:article).as_inverse_of(:comments) }
+  it { should belong_to(:user).as_inverse_of(:comments) }
+end
+
+describe Record do
+  it { should belong_to(:user).as_inverse_of(:record) }
+end
+
+describe Site do
+  it { should have_many(:users).as_inverse_of(:site).ordered_by(:email.asc) }
+end
+```
 
 Mass Assignment Matcher
 -
-    describe User do
-      it { should allow_mass_assignment_of(:login) }
-      it { should allow_mass_assignment_of(:email) }
-      it { should allow_mass_assignment_of(:age) }
-      it { should allow_mass_assignment_of(:password) }
-      it { should allow_mass_assignment_of(:password) }
-      it { should allow_mass_assignment_of(:role).as(:admin) }
 
-      it { should_not allow_mass_assignment_of(:role) }
-    end
+```ruby
+describe User do
+  it { should allow_mass_assignment_of(:login) }
+  it { should allow_mass_assignment_of(:email) }
+  it { should allow_mass_assignment_of(:age) }
+  it { should allow_mass_assignment_of(:password) }
+  it { should allow_mass_assignment_of(:password) }
+  it { should allow_mass_assignment_of(:role).as(:admin) }
+
+  it { should_not allow_mass_assignment_of(:role) }
+end
+```
 
 Validation Matchers
 -
-    describe Site do
-      it { should validate_presence_of(:name) }
-      it { should validate_uniqueness_of(:name) }
-    end
-
-    describe User do
-      it { should validate_presence_of(:login) }
-      it { should validate_uniqueness_of(:login).scoped_to(:site) }
-      it { should validate_uniqueness_of(:email).case_insensitive.with_message("is already taken") }
-      it { should validate_format_of(:login).to_allow("valid_login").not_to_allow("invalid login") }
-      it { should validate_associated(:profile) }
-      it { should validate_exclusion_of(:login).to_not_allow("super", "index", "edit") }
-      it { should validate_inclusion_of(:role).to_allow("admin", "member") }
-      it { should validate_confirmation_of(:email) }
-      it { should validate_presence_of(:age).on(:create, :update) }
-      it { should validate_numericality_of(:age).on(:create, :update) }
-      it { should validate_inclusion_of(:age).to_allow(23..42).on([:create, :update]) }
-      it { should validate_presence_of(:password).on(:create) }
-      it { should validate_presence_of(:provider_uid).on(:create) }
-      it { should validate_inclusion_of(:locale).to_allow([:en, :ru]) }
-	  end
-
-    describe Article do
-      it { should validate_length_of(:title).within(8..16) }
-    end
-
-    describe Profile do
-      it { should validate_numericality_of(:age).greater_than(0) }
-    end
-
-    describe MovieArticle do
-      it { should validate_numericality_of(:rating).to_allow(:greater_than => 0).less_than_or_equal_to(5) }
-      it { should validate_numericality_of(:classification).to_allow(:even => true, :only_integer => true, :nil => false) }
-    end
-
-    describe Person do
-       # in order to be able to use the custom_validate matcher, the custom validator class (in this case SsnValidator)
-       # should redefine the kind method to return :custom, i.e. "def self.kind() :custom end"
-      it { should custom_validate(:ssn).with_validator(SsnValidator) }
-    end
+
+```ruby
+describe Site do
+  it { should validate_presence_of(:name) }
+  it { should validate_uniqueness_of(:name) }
+end
+
+describe User do
+  it { should validate_presence_of(:login) }
+  it { should validate_uniqueness_of(:login).scoped_to(:site) }
+  it { should validate_uniqueness_of(:email).case_insensitive.with_message("is already taken") }
+  it { should validate_format_of(:login).to_allow("valid_login").not_to_allow("invalid login") }
+  it { should validate_associated(:profile) }
+  it { should validate_exclusion_of(:login).to_not_allow("super", "index", "edit") }
+  it { should validate_inclusion_of(:role).to_allow("admin", "member") }
+  it { should validate_confirmation_of(:email) }
+  it { should validate_presence_of(:age).on(:create, :update) }
+  it { should validate_numericality_of(:age).on(:create, :update) }
+  it { should validate_inclusion_of(:age).to_allow(23..42).on([:create, :update]) }
+  it { should validate_presence_of(:password).on(:create) }
+  it { should validate_presence_of(:provider_uid).on(:create) }
+  it { should validate_inclusion_of(:locale).to_allow([:en, :ru]) }
+end
+
+describe Article do
+  it { should validate_length_of(:title).within(8..16) }
+end
+
+describe Profile do
+  it { should validate_numericality_of(:age).greater_than(0) }
+end
+
+describe MovieArticle do
+  it { should validate_numericality_of(:rating).to_allow(:greater_than => 0).less_than_or_equal_to(5) }
+  it { should validate_numericality_of(:classification).to_allow(:even => true, :only_integer => true, :nil => false) }
+end
+
+describe Person do
+   # in order to be able to use the custom_validate matcher, the custom validator class (in this case SsnValidator)
+   # should redefine the kind method to return :custom, i.e. "def self.kind() :custom end"
+  it { should custom_validate(:ssn).with_validator(SsnValidator) }
+end
+```
 
 Accepts Nested Attributes Matcher
 -
-    describe User do
-      it { should accept_nested_attributes_for(:articles) }
-      it { should accept_nested_attributes_for(:comments) }
-    end
 
-    describe Article do
-      it { should accept_nested_attributes_for(:permalink) }
-    end
+```ruby
+describe User do
+  it { should accept_nested_attributes_for(:articles) }
+  it { should accept_nested_attributes_for(:comments) }
+end
+
+describe Article do
+  it { should accept_nested_attributes_for(:permalink) }
+end
+```
 
 Index Matcher
 -
-    describe Article do
-      it { should have_index_for(published: 1) }
-      it { should have_index_for(title: 1).with_options(unique: true, background: true) }
-    end
 
-    describe Profile do
-      it { should have_index_for(first_name: 1, last_name: 1) }
-    end
+```ruby
+describe Article do
+  it { should have_index_for(published: 1) }
+  it { should have_index_for(title: 1).with_options(unique: true, background: true) }
+end
+
+describe Profile do
+  it { should have_index_for(first_name: 1, last_name: 1) }
+end
+```
 
 Others
 -
-    describe User do
-      it { should have_fields(:email, :login) }
-      it { should have_field(:s).with_alias(:status) }
-      it { should have_fields(:birthdate, :registered_at).of_type(DateTime) }
-
-      it { should be_timestamped_document } # if you're declaring `include
-      Mongoid::Timestamps` or any of `include Mongoid::Timestamps::Created` and `Mongoid::Timestamps::Updated`
-      it { should be_timestamped_document.with(:created) }
-      it { should_not be_timestamped_document.with(:updated) }
-
-      it { should be_versioned_document } # if you're declaring `include Mongoid::Versioning`
-      it { should be_paranoid_document } # if you're declaring `include Mongoid::Paranoia`
-      it { should be_multiparameted_document } # if you're declaring `include Mongoid::MultiParameterAttributes`
-    end
-
-    describe Log do
-      it { should be_stored_in :logs }
-    end
-
-    describe Article do
-      it { should have_field(:published).of_type(Boolean).with_default_value_of(false) }
-      it { should have_field(:allow_comments).of_type(Boolean).with_default_value_of(true) }
-      it { should_not have_field(:allow_comments).of_type(Boolean).with_default_value_of(false) }
-      it { should_not have_field(:number_of_comments).of_type(Integer).with_default_value_of(1) }
-    end
+
+```ruby
+describe User do
+  it { should have_fields(:email, :login) }
+  it { should have_field(:s).with_alias(:status) }
+  it { should have_fields(:birthdate, :registered_at).of_type(DateTime) }
+
+  # if you're declaring 'include Mongoid::Timestamps'
+  # or any of 'include Mongoid::Timestamps::Created' and 'Mongoid::Timestamps::Updated'
+  it { should be_timestamped_document }
+  it { should be_timestamped_document.with(:created) }
+  it { should_not be_timestamped_document.with(:updated) }
+
+  it { should be_versioned_document } # if you're declaring `include Mongoid::Versioning`
+  it { should be_paranoid_document } # if you're declaring `include Mongoid::Paranoia`
+  it { should be_multiparameted_document } # if you're declaring `include Mongoid::MultiParameterAttributes`
+end
+
+describe Log do
+  it { should be_stored_in :logs }
+end
+
+describe Article do
+  it { should have_field(:published).of_type(Boolean).with_default_value_of(false) }
+  it { should have_field(:allow_comments).of_type(Boolean).with_default_value_of(true) }
+  it { should_not have_field(:allow_comments).of_type(Boolean).with_default_value_of(false) }
+  it { should_not have_field(:number_of_comments).of_type(Integer).with_default_value_of(1) }
+end
+```
 
 Known issues
 -

data/lib/matchers/associations.rb

@@ -43,6 +43,12 @@ module Mongoid
           raise "#{@association[:type].inspect} does not respond to :order" unless [HAS_MANY, HAS_AND_BELONGS_TO_MANY, EMBEDS_MANY].include?(@association[:type])
           @association[:order] = association_field_name.to_s
           @expectation_message << " ordered by #{@association[:order].inspect}"
+
+          if association_field_name.is_a? Origin::Key
+            @association[:order_operator] = association_field_name.operator
+            @expectation_message << " #{order_way(@association[:order_operator])}"
+          end
+
           self
         end
 
@@ -70,8 +76,28 @@ module Mongoid
           self
         end
 
+        def with_polymorphism
+          @association[:polymorphic] = true
+          @expectation_message << " which specifies polymorphic as #{@association[:polymorphic].to_s}"
+          self
+        end
+
+        def with_cascading_callbacks
+          @association[:cascade_callbacks] = true
+          @expectation_message << " which specifies cascade_callbacks as #{@association[:cascade_callbacks].to_s}"
+          self
+        end
+
+        def cyclic
+          @association[:cyclic] = true
+          @expectation_message << " which specifies cyclic as #{@association[:cyclic].to_s}"
+          self
+        end
+
         def stored_as(store_as)
-          raise NotImplementedError, "`references_many #{@association[:name]} :stored_as => :array` has been removed in Mongoid 2.0.0.rc, use `references_and_referenced_in_many #{@association[:name]}` instead"
+          @association[:store_as] = store_as.to_s
+          @expectation_message << " which is stored as #{@association[:store_as].inspect}"
+          self
         end
 
         def with_foreign_key(foreign_key)
@@ -124,6 +150,15 @@ module Mongoid
             end
           end
 
+          if @association[:order_operator]
+            if @association[:order_operator] != metadata.order.operator
+              @negative_result_message = "#{@positive_result_message} #{order_way(@association[:order_operator] * -1)}"
+              return false
+            else
+              @positive_result_message = "#{@positive_result_message} #{order_way(@association[:order_operator])}"
+            end
+          end
+
           if @association[:dependent]
             if @association[:dependent].to_s != metadata.dependent.to_s
               @negative_result_message = "#{@positive_result_message} which specified dependent as #{metadata.dependent}"
@@ -151,6 +186,42 @@ module Mongoid
             end
           end
 
+          if @association[:polymorphic]
+            if metadata.polymorphic? != true
+              @negative_result_message = "#{@positive_result_message} which did not set polymorphic"
+              return false
+            else
+              @positive_result_message = "#{@positive_result_message} which set polymorphic"
+            end
+          end
+
+          if @association[:cascade_callbacks]
+            if metadata.cascading_callbacks? != true
+              @negative_result_message = "#{@positive_result_message} which did not set cascade_callbacks"
+              return false
+            else
+              @positive_result_message = "#{@positive_result_message} which set cascade_callbacks"
+            end
+          end
+
+          if @association[:cyclic]
+            if metadata.cyclic? != true
+              @negative_result_message = "#{@positive_result_message} which did not set cyclic"
+              return false
+            else
+              @positive_result_message = "#{@positive_result_message} which set cyclic"
+            end
+          end
+
+          if @association[:store_as]
+            if metadata.store_as != @association[:store_as]
+              @negative_result_message = "#{@positive_result_message} which is stored as #{metadata.store_as}"
+              return false
+            else
+              @positive_result_message = "#{@positive_result_message} which is stored as #{metadata.store_as}"
+            end
+          end
+
           if @association[:index]
             if metadata.index != true
               @negative_result_message = "#{@positive_result_message} which did not set index"
@@ -187,24 +258,30 @@ module Mongoid
         def type_description(type = nil, passive = true)
           type ||= @association[:type]
           case type.name
-          when EMBEDS_ONE.name
-            (passive ? 'embed' : 'embeds') << ' one'
-          when EMBEDS_MANY.name
-            (passive ? 'embed' : 'embeds') << ' many'
-          when EMBEDDED_IN.name
-            (passive ? 'be' : 'is') << ' embedded in'
-          when HAS_ONE.name
-            (passive ? 'reference' : 'references') << ' one'
-          when HAS_MANY.name
-            (passive ? 'reference' : 'references') << ' many'
-          when HAS_AND_BELONGS_TO_MANY.name
-            (passive ? 'reference' : 'references') << ' and referenced in many'
-          when BELONGS_TO.name
-            (passive ? 'be referenced in' : 'referenced in')
-          else
-            raise "Unknown association type '%s'" % type
+            when EMBEDS_ONE.name
+              (passive ? 'embed' : 'embeds') << ' one'
+            when EMBEDS_MANY.name
+              (passive ? 'embed' : 'embeds') << ' many'
+            when EMBEDDED_IN.name
+              (passive ? 'be' : 'is') << ' embedded in'
+            when HAS_ONE.name
+              (passive ? 'reference' : 'references') << ' one'
+            when HAS_MANY.name
+              (passive ? 'reference' : 'references') << ' many'
+            when HAS_AND_BELONGS_TO_MANY.name
+              (passive ? 'reference' : 'references') << ' and referenced in many'
+            when BELONGS_TO.name
+              (passive ? 'be referenced in' : 'referenced in')
+            else
+              raise "Unknown association type '%s'" % type
           end
         end
+
+        private
+
+        def order_way(operator)
+          [nil, "ascending", "descending"][operator]
+        end
       end
 
       def embed_one(association_name)

data/lib/matchers/document.rb

@@ -14,7 +14,7 @@ module Mongoid
         @type = type
         self
       end
-      
+
       def with_alias(field_alias)
         @field_alias = field_alias
         self
@@ -54,7 +54,7 @@ module Mongoid
                 @errors.push "is not localized #{attr.inspect}"
               end
             end
-            
+
           else
             @errors.push "no field named #{attr.inspect}"
           end

data/lib/matchers/indexes.rb

@@ -43,7 +43,7 @@ module Mongoid
         desc
       end
     end
-    
+
     def have_index_for(index_fields)
       HaveIndexForMatcher.new(index_fields)
     end

data/lib/matchers/validations/acceptance_of.rb

@@ -1,9 +1,9 @@
 module Mongoid
   module Matchers
-    module Validations  
+    module Validations
       def validate_acceptance_of(field)
         HaveValidationMatcher.new(field, :acceptance)
       end
     end
   end
-end  
+end

data/lib/matchers/validations/associated.rb

@@ -1,19 +1,19 @@
 module Mongoid
   module Matchers
-    module Validations  
+    module Validations
       class ValidateAssociatedMatcher < HaveValidationMatcher
         def initialize(name)
           super(name, :associated)
         end
-        
+
         def description
           "validate associated #{@field.inspect}"
         end
       end
-      
+
       def validate_associated(association_name)
         ValidateAssociatedMatcher.new(association_name)
-      end           
+      end
     end
   end
-end  
+end

data/lib/matchers/validations/confirmation_of.rb

@@ -1,9 +1,9 @@
 module Mongoid
   module Matchers
-    module Validations  
+    module Validations
       def validate_confirmation_of(field)
         HaveValidationMatcher.new(field, :confirmation)
       end
     end
   end
-end  
+end

data/lib/matchers/validations/custom_validation_of.rb

@@ -2,6 +2,7 @@ module Mongoid
   module Matchers
     module Validations
       class ValidateWithCustomValidatorMatcher < HaveValidationMatcher
+        include WithMessage
         def initialize(field)
           super(field, :custom)
         end
@@ -11,11 +12,6 @@ module Mongoid
           self
         end
 
-        def with_message(message)
-          @expected_message = message
-          self
-        end
-
         def matches?(actual)
           return false unless (@result = super(actual))
           check_custom_validator if @custom_validator
@@ -41,19 +37,6 @@ module Mongoid
             @result = false
           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
       end
 
       def custom_validate(field)
@@ -61,4 +44,4 @@ module Mongoid
       end
     end
   end
-end
+end

data/lib/matchers/validations/exclusion_of.rb

@@ -15,7 +15,14 @@ module Mongoid
           return false unless result = super(actual)
 
           if @not_allowed_values
-            allowed_values = @not_allowed_values - @validator.options[:in]
+            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
+
+            allowed_values = @not_allowed_values - validator_not_allowed_values
             if allowed_values.empty?
               @positive_result_message = @positive_result_message << " not allowing all values mentioned"
             else