mongoid-rspec 3.0.0 → 4.0.0

data/spec/unit/be_stored_in.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+RSpec.describe Mongoid::Matchers::BeStoredIn do
+  subject do
+    Class.new do
+      include Mongoid::Document
+      store_in collection: 'citizens', database: 'other', client: 'secondary'
+    end
+  end
+
+  it 'detects storage options' do
+    is_expected.to be_stored_in(collection: 'citizens', database: 'other', client: 'secondary')
+  end
+
+  it 'detects even part of storage options' do
+    is_expected.to be_stored_in(database: 'other')
+    is_expected.to be_stored_in(client: 'secondary')
+    is_expected.to be_stored_in(collection: 'citizens')
+    is_expected.to be_stored_in(collection: 'citizens', database: 'other')
+    is_expected.to be_stored_in(database: 'other', client: 'secondary')
+    is_expected.to be_stored_in(collection: 'citizens', client: 'secondary')
+  end
+
+  it 'detects differences' do
+    is_expected.not_to be_stored_in(collection: 'aliens')
+  end
+
+  context 'when models has storage options defined via blocks, procs or lambdas' do
+    subject do
+      Class.new do
+        include Mongoid::Document
+        store_in database: -> { Thread.current[:database] }
+      end
+    end
+
+    before do
+      Thread.current[:database] = 'db1981'
+    end
+
+    it 'detects storage options' do
+      is_expected.to be_stored_in(database: 'db1981')
+    end
+
+    it 'reflects changes in storage options' do
+      is_expected.to be_stored_in(database: 'db1981')
+      Thread.current[:database] = 'db2200'
+      is_expected.to be_stored_in(database: 'db2200')
+    end
+
+    it 'detects differences' do
+      is_expected.not_to be_stored_in(database: 'other')
+    end
+  end
+end

data/spec/unit/document_spec.rb

@@ -1,26 +1,17 @@
 require 'spec_helper'
 
-RSpec.describe "Document" do
+RSpec.describe 'Document' do
   describe User do
     it { is_expected.to have_fields(:email, :login) }
-    it { is_expected.to be_timestamped_document }
-    it { is_expected.to be_timestamped_document.with(:created) }
-    it { is_expected.not_to be_timestamped_document.with(:updated) }
   end
 
   describe Article do
-    it { is_expected.to have_field(:published).of_type(Mongoid::Boolean).with_default_value_of(false) }
-    it { is_expected.to have_field(:allow_comments).of_type(Mongoid::Boolean).with_default_value_of(true) }
+    klass_boolean = Mongoid::Compatibility::Version.mongoid4_or_newer? ? Mongoid::Boolean : Boolean
+    it { is_expected.to have_field(:published).of_type(klass_boolean).with_default_value_of(false) }
+    it { is_expected.to have_field(:allow_comments).of_type(klass_boolean).with_default_value_of(true) }
     it { is_expected.to belong_to(:author) }
     it { is_expected.to have_field(:title).localized }
-    it { is_expected.not_to have_field(:allow_comments).of_type(Mongoid::Boolean).with_default_value_of(false) }
+    it { is_expected.not_to have_field(:allow_comments).of_type(klass_boolean).with_default_value_of(false) }
     it { is_expected.not_to have_field(:number_of_comments).of_type(Integer).with_default_value_of(1) }
-    it { is_expected.to be_mongoid_document }
-    it { is_expected.to be_timestamped_document }
-  end
-
-  describe Log do
-    it { is_expected.to be_mongoid_document }
-    it { is_expected.to be_dynamic_document }
   end
 end

data/spec/unit/have_index_for_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+RSpec.describe Mongoid::Matchers::HaveIndexFor do
+  subject do
+    Class.new do
+      include Mongoid::Document
+
+      field :fizz, as: :buzz, type: String
+
+      index(foo: 1)
+      index({ bar: 1 }, unique: true, background: true, drop_dups: true)
+      index(foo: 1, bar: -1)
+      index('baz._id' => 1)
+      index(buzz: 1)
+    end
+  end
+
+  it 'detects an index for singular field key' do
+    is_expected.to have_index_for(foo: 1)
+  end
+
+  it 'detects an index for multipple fields key' do
+    is_expected.to have_index_for(foo: 1, bar: -1)
+  end
+
+  it 'detects an index with options' do
+    is_expected
+      .to have_index_for(bar: 1)
+      .with_options(unique: true, background: true, drop_dups: true)
+  end
+
+  it 'detects an index with only part of options' do
+    is_expected
+      .to have_index_for(bar: 1)
+      .with_options(unique: true)
+  end
+
+  it 'detects an index for string key' do
+    is_expected.to have_index_for('baz._id' => 1)
+  end
+
+  it 'detect an index for aliased fields' do
+    is_expected.to have_index_for(fizz: 1)
+    is_expected.to have_index_for(buzz: 1) if Mongoid::Compatibility::Version.mongoid4_or_newer?
+  end
+end

data/spec/unit/have_timestamps_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+RSpec.describe Mongoid::Matchers::HaveTimestamps do
+  context 'when model includes Mongoid::Timestamps' do
+    subject do
+      Class.new do
+        include Mongoid::Document
+        include Mongoid::Timestamps
+      end
+    end
+
+    it { is_expected.to have_timestamps }
+  end
+
+  context 'when model includes Mongoid::Timestamps::Short' do
+    subject do
+      Class.new do
+        include Mongoid::Document
+        include Mongoid::Timestamps::Short
+      end
+    end
+
+    it { is_expected.to have_timestamps.shortened }
+  end
+
+  context 'when model includes Mongoid::Timestamps::Updated' do
+    subject do
+      Class.new do
+        include Mongoid::Document
+        include Mongoid::Timestamps::Updated
+      end
+    end
+
+    it { is_expected.to have_timestamps.for(:updating) }
+  end
+
+  context 'when model includes Mongoid::Timestamps::Updated::Short' do
+    subject do
+      Class.new do
+        include Mongoid::Document
+        include Mongoid::Timestamps::Updated::Short
+      end
+    end
+
+    it { is_expected.to have_timestamps.for(:updating).shortened }
+    it { is_expected.to have_timestamps.shortened.for(:updating) }
+  end
+
+  context 'when model includes Mongoid::Timestamps::Created' do
+    subject do
+      Class.new do
+        include Mongoid::Document
+        include Mongoid::Timestamps::Created
+      end
+    end
+
+    it { is_expected.to have_timestamps.for(:creating) }
+  end
+
+  context 'when model includes Mongoid::Timestamps::Created::Short' do
+    subject do
+      Class.new do
+        include Mongoid::Document
+        include Mongoid::Timestamps::Created::Short
+      end
+    end
+
+    it { is_expected.to have_timestamps.for(:creating).shortened }
+    it { is_expected.to have_timestamps.shortened.for(:creating) }
+  end
+end

data/spec/unit/validations_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe "Validations" do
+RSpec.describe 'Validations' do
   describe Site do
     it { is_expected.to validate_presence_of(:name) }
     it { is_expected.to validate_uniqueness_of(:name) }
@@ -9,45 +9,52 @@ RSpec.describe "Validations" do
   describe User do
     it { is_expected.to validate_presence_of(:login) }
     it { is_expected.to validate_uniqueness_of(:login).scoped_to(:site) }
-    it { is_expected.to validate_uniqueness_of(:email).case_insensitive.with_message("is already taken") }
-    it { is_expected.to validate_format_of(:login).to_allow("valid_login").not_to_allow("invalid login") }
+    it { is_expected.to validate_uniqueness_of(:email).case_insensitive.with_message('is already taken') }
+    it { is_expected.to validate_format_of(:login).to_allow('valid_login').not_to_allow('invalid login') }
     it { is_expected.to validate_associated(:profile) }
-    it { is_expected.to validate_exclusion_of(:login).to_not_allow("super", "index", "edit") }
-    it { is_expected.to validate_exclusion_of(:password).to_not_allow("password") }
-    it { is_expected.to validate_inclusion_of(:role).to_allow("admin", "member") }
-    it { is_expected.to validate_inclusion_of(:role).to_allow(["admin", "member"]) }
+    it { is_expected.to validate_exclusion_of(:login).to_not_allow('super', 'index', 'edit') }
+    it { is_expected.to validate_exclusion_of(:password).to_not_allow('password') }
+    it { is_expected.to validate_inclusion_of(:role).to_allow('admin', 'member') }
+    it { is_expected.to validate_inclusion_of(:role).to_allow(%w[admin member]) }
     it { is_expected.to validate_confirmation_of(:email) }
     it { is_expected.to validate_presence_of(:age).on(:create, :update) }
     it { is_expected.to validate_numericality_of(:age).on(:create, :update) }
-    it { is_expected.to validate_inclusion_of(:age).to_allow(23..42).on([:create, :update]) }
+    it { is_expected.to validate_inclusion_of(:age).to_allow(23..42).on(%i[create update]) }
     it { is_expected.to validate_presence_of(:password).on(:create) }
-    it { is_expected.to validate_confirmation_of(:password).with_message("Password confirmation must match given password") }
+    it { is_expected.to validate_confirmation_of(:password).with_message('Password confirmation must match given password') }
     it { is_expected.to validate_presence_of(:provider_uid).on(:create) }
-    it { is_expected.to validate_inclusion_of(:locale).to_allow([:en, :ru]) }
+    it { is_expected.to validate_inclusion_of(:locale).to_allow(%i[en ru]) }
   end
 
   describe Profile do
     it { is_expected.to validate_numericality_of(:age).greater_than(0) }
+    it { is_expected.not_to validate_numericality_of(:age).greater_than(0).only_integer(true) }
     it { is_expected.to validate_acceptance_of(:terms_of_service) }
-    it { is_expected.to validate_length_of(:hobbies).with_minimum(1).with_message("requires at least one hobby") }
+    it { is_expected.to validate_length_of(:hobbies).with_minimum(1).with_message('requires at least one hobby') }
   end
 
   describe Article do
     it { is_expected.to validate_length_of(:title).within(8..16) }
     it { is_expected.not_to validate_length_of(:content).greater_than(200).less_than(16) }
     it { is_expected.to validate_length_of(:content).greater_than(200) }
-    it { is_expected.to validate_inclusion_of(:status).to_allow([:pending]).on( :create ) }
-    it { is_expected.to validate_inclusion_of(:status).to_allow([:approved, :rejected]).on( :update ) }
+    it { is_expected.to validate_inclusion_of(:status).to_allow([:pending]).on(:create) }
+    it { is_expected.to validate_inclusion_of(:status).to_allow(%i[approved rejected]).on(:update) }
   end
 
   describe MovieArticle do
     it { is_expected.to validate_numericality_of(:rating).greater_than(0) }
-    it { is_expected.to validate_numericality_of(:rating).to_allow(:greater_than => 0).less_than_or_equal_to(5) }
-    it { is_expected.to validate_numericality_of(:classification).to_allow(:even => true, :only_integer => true, :nil => false) }
+    it { is_expected.to validate_numericality_of(:rating).to_allow(greater_than: 0).less_than_or_equal_to(5) }
+    it { is_expected.to validate_numericality_of(:classification).to_allow(even: true, only_integer: true, nil: false) }
   end
 
   describe Person do
     it { is_expected.to custom_validate(:ssn).with_validator(SsnValidator) }
     it { is_expected.not_to custom_validate(:name) }
   end
+
+  describe Message do
+    it { is_expected.to validate_uniqueness_of(:identifier).with_message('uniqueness') }
+    it { is_expected.to validate_presence_of(:from).with_message('required') }
+    it { is_expected.to validate_format_of(:to).with_message('format') }
+  end
 end

data/spec/validators/ssn_validator.rb

@@ -1,16 +1,16 @@
-class SsnValidator <  ActiveModel::EachValidator
-
+class SsnValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     unless valid_ssn?(record, attribute, value)
       record.errors[attribute] << "#{value} is not a valid Social Security Number"
     end
   end
 
-  def self.kind() :custom end
+  def self.kind
+    :custom
+  end
 
-  def valid_ssn?(record, attribute, value)
+  def valid_ssn?(_record, _attribute, _value)
     # irrelevant here how validation is done
     true
   end
-
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-rspec
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Evan Sagge
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2018-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -53,28 +53,55 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: mongoid-compatibility
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: RSpec matches for Mongoid models, including association and validation
-  matchers
+  matchers.
 email: evansagge@gmail.com contato@rodrigopinto.me
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
-- Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/matchers/accept_nested_attributes.rb
 - lib/matchers/allow_mass_assignment.rb
 - lib/matchers/associations.rb
-- lib/matchers/collections.rb
-- lib/matchers/document.rb
-- lib/matchers/indexes.rb
+- lib/matchers/be_dynamic_document.rb
+- lib/matchers/be_mongoid_document.rb
+- lib/matchers/be_stored_in.rb
+- lib/matchers/have_field.rb
+- lib/matchers/have_timestamps.rb
+- lib/matchers/indexes/have_index_for.rb
+- lib/matchers/indexes/v3/have_index_for.rb
+- lib/matchers/indexes/v4/have_index_for.rb
 - lib/matchers/validations.rb
 - lib/matchers/validations/acceptance_of.rb
 - lib/matchers/validations/associated.rb
@@ -87,14 +114,13 @@ files:
 - lib/matchers/validations/numericality_of.rb
 - lib/matchers/validations/presence_of.rb
 - lib/matchers/validations/uniqueness_of.rb
-- lib/matchers/validations/with_message.rb
 - lib/mongoid-rspec.rb
 - lib/mongoid/rspec.rb
 - lib/mongoid/rspec/version.rb
-- mongoid-rspec.gemspec
 - spec/models/article.rb
 - spec/models/comment.rb
 - spec/models/log.rb
+- spec/models/message.rb
 - spec/models/movie_article.rb
 - spec/models/permalink.rb
 - spec/models/person.rb
@@ -105,13 +131,17 @@ files:
 - spec/spec_helper.rb
 - spec/unit/accept_nested_attributes_spec.rb
 - spec/unit/associations_spec.rb
-- spec/unit/collections_spec.rb
+- spec/unit/be_dynamic_document_spec.rb
+- spec/unit/be_mongoid_document_spec.rb
+- spec/unit/be_stored_in.rb
 - spec/unit/document_spec.rb
-- spec/unit/indexes_spec.rb
+- spec/unit/have_index_for_spec.rb
+- spec/unit/have_timestamps_spec.rb
 - spec/unit/validations_spec.rb
 - spec/validators/ssn_validator.rb
 homepage: http://github.com/mongoid-rspec/mongoid-rspec
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -121,15 +151,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.6
 requirements: []
 rubyforge_project: mongoid-rspec
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: RSpec matchers for Mongoid
@@ -137,6 +167,7 @@ test_files:
 - spec/models/article.rb
 - spec/models/comment.rb
 - spec/models/log.rb
+- spec/models/message.rb
 - spec/models/movie_article.rb
 - spec/models/permalink.rb
 - spec/models/person.rb
@@ -147,8 +178,11 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/accept_nested_attributes_spec.rb
 - spec/unit/associations_spec.rb
-- spec/unit/collections_spec.rb
+- spec/unit/be_dynamic_document_spec.rb
+- spec/unit/be_mongoid_document_spec.rb
+- spec/unit/be_stored_in.rb
 - spec/unit/document_spec.rb
-- spec/unit/indexes_spec.rb
+- spec/unit/have_index_for_spec.rb
+- spec/unit/have_timestamps_spec.rb
 - spec/unit/validations_spec.rb
 - spec/validators/ssn_validator.rb