mongo_mapper 0.13.1 → 0.14.0.rc1

data/spec/unit/identity_map_middleware_spec.rb

@@ -36,7 +36,7 @@ module IdentityMapSpec
           [200, {}, nil]
         }
         mw.call({})
-        called.should be_true
+        called.should be_truthy
       end
 
       it "should enable identity map during delegation" do
@@ -86,14 +86,14 @@ module IdentityMapSpec
 
       context "with a successful request" do
         it "should clear the identity map" do
-          MongoMapper::Plugins::IdentityMap.should_receive(:clear).twice
+          expect(MongoMapper::Plugins::IdentityMap).to receive(:clear).twice
           get '/'
         end
       end
 
       context "when the request raises an error" do
         it "should clear the identity map" do
-          MongoMapper::Plugins::IdentityMap.should_receive(:clear).once
+          expect(MongoMapper::Plugins::IdentityMap).to receive(:clear).once
           get '/fail' rescue nil
         end
       end
@@ -117,14 +117,14 @@ module IdentityMapSpec
 
   #   context "with a successful request" do
   #     it "should clear the identity map" do
-  #       MongoMapper::Plugins::IdentityMap.should_receive(:clear).twice
+  #       expect(MongoMapper::Plugins::IdentityMap).to receive(:clear).twice
   #       get '/'
   #     end
   #   end
 
   #   context "when the request raises an error" do
   #     it "should clear the identity map" do
-  #       MongoMapper::Plugins::IdentityMap.should_receive(:clear).twice
+  #       expect(MongoMapper::Plugins::IdentityMap).to receive(:clear).twice
   #       get '/fail' rescue nil
   #     end
   #   end

data/spec/unit/key_spec.rb

@@ -50,13 +50,13 @@ describe "Key" do
       key = Key.new(:foo, String, :required => true)
       key.name.should == 'foo'
       key.type.should == String
-      key.options[:required].should be_true
+      key.options[:required].should be_truthy
     end
 
     it "should work with name and options" do
       key = Key.new(:foo, :required => true)
       key.name.should == 'foo'
-      key.options[:required].should be_true
+      key.options[:required].should be_truthy
     end
 
     it "should not permit reserved names" do
@@ -90,20 +90,20 @@ describe "Key" do
     end
 
     it "should know if it is a embedded_document" do
-      Key.new(:name, EDoc()).embeddable?.should be_true
+      Key.new(:name, EDoc()).embeddable?.should be_truthy
     end
 
     it "should know if it is not a embedded_document" do
-      Key.new(:name, String).embeddable?.should be_false
+      Key.new(:name, String).embeddable?.should be_falsey
     end
 
     it "should know if it is a number" do
-      Key.new(:age, Integer).number?.should be_true
-      Key.new(:age, Float).number?.should be_true
+      Key.new(:age, Integer).number?.should be_truthy
+      Key.new(:age, Float).number?.should be_truthy
     end
 
     it "should know if it is not a number" do
-      Key.new(:age, String).number?.should be_false
+      Key.new(:age, String).number?.should be_falsey
     end
   end
 
@@ -148,31 +148,34 @@ describe "Key" do
 
     context "with :read" do
       let(:accessor) { :read }
-      its(:read_accessor?) { should be_true }
-      its(:write_accessor?) { should be_false }
-      its(:predicate_accessor?) { should be_false }
+
+      it { expect( subject.read_accessor? ).to be_truthy }
+      it { expect( subject.write_accessor? ).to be_falsey }
+      it { expect( subject.predicate_accessor? ).to be_falsey }
     end
 
     context "with :write" do
       let(:accessor) { :write }
-      its(:read_accessor?) { should be_false }
-      its(:write_accessor?) { should be_true }
-      its(:predicate_accessor?) { should be_false }
+
+      it { expect( subject.read_accessor? ).to be_falsey }
+      it { expect( subject.write_accessor? ).to be_truthy }
+      it { expect( subject.predicate_accessor? ).to be_falsey }
     end
 
     context "with :predicate" do
       let(:accessor) { :predicate }
-      its(:read_accessor?) { should be_false }
-      its(:write_accessor?) { should be_false }
-      its(:predicate_accessor?) { should be_true }
+
+      it { expect( subject.read_accessor? ).to be_falsey }
+      it { expect( subject.write_accessor? ).to be_falsey }
+      it { expect( subject.predicate_accessor? ).to be_truthy }
     end
 
     context "with an array of options" do
       let(:accessor) { [:read, :write] }
 
-      its(:read_accessor?) { should be_true }
-      its(:write_accessor?) { should be_true }
-      its(:predicate_accessor?) { should be_false }
+      it { expect( subject.read_accessor? ).to be_truthy }
+      it { expect( subject.write_accessor? ).to be_truthy }
+      it { expect( subject.predicate_accessor? ).to be_falsey }
     end
   end
 
@@ -254,11 +257,11 @@ describe "Key" do
       end
 
       it "should work with Boolean type and false value" do
-        Key.new(:active, Boolean, :default => false).default_value.should be_false
+        Key.new(:active, Boolean, :default => false).default_value.should be_falsey
       end
 
       it "should work with Boolean type and true value" do
-        Key.new(:active, Boolean, :default => true).default_value.should be_true
+        Key.new(:active, Boolean, :default => true).default_value.should be_truthy
       end
 
       it "should work with Array values" do

data/spec/unit/keys_spec.rb

@@ -16,11 +16,11 @@ describe "Key" do
 
   context ".key?(:symbol)" do
     it "should be true if document has key" do
-      Address.key?(:city).should be_true
+      Address.key?(:city).should be_truthy
     end
 
     it "should be false if document does not have key" do
-      Address.key?(:foo).should be_false
+      Address.key?(:foo).should be_falsey
     end
   end
 
@@ -30,7 +30,7 @@ describe "Key" do
         key :_id, Integer
       end
       doc = klass.new
-      doc.should_receive(:warn).once
+      expect(doc).to receive(:warn).once
       doc.assign({:x => :y})
     end
   end
@@ -59,11 +59,11 @@ describe "Key" do
 
   context ".key?('string')" do
     it "should be true if document has key" do
-      Address.key?('city').should be_true
+      Address.key?('city').should be_truthy
     end
 
     it "should be false if document does not have key" do
-      Address.key?('foo').should be_false
+      Address.key?('foo').should be_falsey
     end
   end
 

data/spec/unit/mongo_mapper_spec.rb

@@ -40,9 +40,9 @@ describe "MongoMapper" do
       MongoMapper.config = {
         'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'}
       }
-      Mongo::MongoClient.should_receive(:new).with('127.0.0.1', 27017, {})
-      MongoMapper.should_receive(:database=).with('test')
-      Mongo::DB.any_instance.should_receive(:authenticate).never
+      expect(Mongo::MongoClient).to receive(:new).with('127.0.0.1', 27017, {})
+      expect(MongoMapper).to receive(:database=).with('test')
+      expect_any_instance_of(Mongo::DB).to receive(:authenticate).never
       MongoMapper.connect('development')
     end
 
@@ -50,9 +50,9 @@ describe "MongoMapper" do
       MongoMapper.config = {
         'development' => {'uri' => 'mongodb://127.0.0.1:27017/test'}
       }
-      Mongo::MongoClient.should_receive(:new).with('127.0.0.1', 27017, {})
-      MongoMapper.should_receive(:database=).with('test')
-      Mongo::DB.any_instance.should_receive(:authenticate).never
+      expect(Mongo::MongoClient).to receive(:new).with('127.0.0.1', 27017, {})
+      expect(MongoMapper).to receive(:database=).with('test')
+      expect_any_instance_of(Mongo::DB).to receive(:authenticate).never
       MongoMapper.connect('development')
     end
 
@@ -60,9 +60,9 @@ describe "MongoMapper" do
       MongoMapper.config = {
         'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'}
       }
-      Mongo::MongoClient.should_receive(:new).with('127.0.0.1', 27017, {})
-      MongoMapper.should_receive(:database=).with('test')
-      Mongo::DB.any_instance.should_receive(:authenticate).never
+      expect(Mongo::MongoClient).to receive(:new).with('127.0.0.1', 27017, {})
+      expect(MongoMapper).to receive(:database=).with('test')
+      expect_any_instance_of(Mongo::DB).to receive(:authenticate).never
       MongoMapper.connect(:development)
     end
 
@@ -71,7 +71,7 @@ describe "MongoMapper" do
         'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test'}
       }
       connection, logger = double('connection'), double('logger')
-      Mongo::MongoClient.should_receive(:new).with('127.0.0.1', 27017, :logger => logger)
+      expect(Mongo::MongoClient).to receive(:new).with('127.0.0.1', 27017, :logger => logger)
       MongoMapper.connect('development', :logger => logger)
     end
 
@@ -80,7 +80,7 @@ describe "MongoMapper" do
         'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test', 'ssl' => true}
       }
       connection, logger = double('connection'), double('logger')
-      Mongo::MongoClient.should_receive(:new).with('127.0.0.1', 27017, :logger => logger, :ssl => true)
+      expect(Mongo::MongoClient).to receive(:new).with('127.0.0.1', 27017, :logger => logger, :ssl => true)
       MongoMapper.connect('development', :logger => logger)
     end
 
@@ -89,7 +89,7 @@ describe "MongoMapper" do
         'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test', 'ssl' => false}
       }
       connection, logger = double('connection'), double('logger')
-      Mongo::MongoClient.should_receive(:new).with('127.0.0.1', 27017, :logger => logger, :ssl => false)
+      expect(Mongo::MongoClient).to receive(:new).with('127.0.0.1', 27017, :logger => logger, :ssl => false)
       MongoMapper.connect('development', :logger => logger)
     end
 
@@ -98,7 +98,7 @@ describe "MongoMapper" do
         'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test', 'options' =>  {'read' => 'primary'}}
       }
       connection, logger = double('connection'), double('logger')
-      Mongo::MongoClient.should_receive(:new).with('127.0.0.1', 27017, :logger => logger, :read => :primary)
+      expect(Mongo::MongoClient).to receive(:new).with('127.0.0.1', 27017, :logger => logger, :read => :primary)
       MongoMapper.connect('development', :logger => logger)
     end
 
@@ -107,7 +107,7 @@ describe "MongoMapper" do
         'development' => {'host' => '192.168.1.1', 'port' => 2222, 'database' => 'test', 'options' => {'safe' => true}}
       }
       connection, logger = double('connection'), double('logger')
-      Mongo::MongoClient.should_receive(:new).with('192.168.1.1', 2222, :logger => logger, :safe => true)
+      expect(Mongo::MongoClient).to receive(:new).with('192.168.1.1', 2222, :logger => logger, :safe => true)
       MongoMapper.connect('development', :logger => logger)
     end
 
@@ -116,7 +116,7 @@ describe "MongoMapper" do
         'development' => {'uri' => 'mongodb://127.0.0.1:27017/test'}
       }
       connection, logger = double('connection'), double('logger')
-      Mongo::MongoClient.should_receive(:new).with('127.0.0.1', 27017, :logger => logger)
+      expect(Mongo::MongoClient).to receive(:new).with('127.0.0.1', 27017, :logger => logger)
       MongoMapper.connect('development', :logger => logger)
     end
 
@@ -124,7 +124,7 @@ describe "MongoMapper" do
       MongoMapper.config = {
         'development' => {'host' => '127.0.0.1', 'port' => 27017, 'database' => 'test', 'username' => 'john', 'password' => 'secret'}
       }
-      Mongo::DB.any_instance.should_receive(:authenticate).with('john', 'secret')
+      expect_any_instance_of(Mongo::DB).to receive(:authenticate).with('john', 'secret')
       MongoMapper.connect('development')
     end
 
@@ -132,7 +132,7 @@ describe "MongoMapper" do
       MongoMapper.config = {
         'development' => {'uri' => 'mongodb://john:secret@127.0.0.1:27017/test'}
       }
-      Mongo::DB.any_instance.should_receive(:authenticate).with('john', 'secret')
+      expect_any_instance_of(Mongo::DB).to receive(:authenticate).with('john', 'secret')
       MongoMapper.connect('development')
     end
 
@@ -151,9 +151,9 @@ describe "MongoMapper" do
         }
       }
 
-      Mongo::MongoReplicaSetClient.should_receive(:new).with( ['127.0.0.1', 27017], ['localhost', 27017], {'read_secondary' => true} )
-      MongoMapper.should_receive(:database=).with('test')
-      Mongo::DB.any_instance.should_receive(:authenticate).never
+      expect(Mongo::MongoReplicaSetClient).to receive(:new).with( ['127.0.0.1', 27017], ['localhost', 27017], {'read_secondary' => true} )
+      expect(MongoMapper).to receive(:database=).with('test')
+      expect_any_instance_of(Mongo::DB).to receive(:authenticate).never
       MongoMapper.connect('development', 'read_secondary' => true)
     end
 
@@ -165,9 +165,9 @@ describe "MongoMapper" do
         }
       }
 
-      Mongo::MongoReplicaSetClient.should_receive(:new).with( ['127.0.0.1:27017', 'localhost:27017'], {'read_secondary' => true} )
-      MongoMapper.should_receive(:database=).with('test')
-      Mongo::DB.any_instance.should_receive(:authenticate).never
+      expect(Mongo::MongoReplicaSetClient).to receive(:new).with( ['127.0.0.1:27017', 'localhost:27017'], {'read_secondary' => true} )
+      expect(MongoMapper).to receive(:database=).with('test')
+      expect_any_instance_of(Mongo::DB).to receive(:authenticate).never
       MongoMapper.connect('development', 'read_secondary' => true)
     end
   end
@@ -175,9 +175,9 @@ describe "MongoMapper" do
   context "setup" do
     it "should work as shortcut for setting config, environment and options" do
       config, logger = double('config'), double('logger')
-      MongoMapper.should_receive(:config=).with(config)
-      MongoMapper.should_receive(:connect).with('development', :logger => logger)
-      MongoMapper.should_receive(:handle_passenger_forking).once
+      expect(MongoMapper).to receive(:config=).with(config)
+      expect(MongoMapper).to receive(:connect).with('development', :logger => logger)
+      expect(MongoMapper).to receive(:handle_passenger_forking).once
       MongoMapper.setup(config, 'development', :logger => logger)
     end
   end

data/spec/unit/rails_spec.rb

@@ -163,7 +163,7 @@ describe "Rails integration" do
 
         it "should array representation of id if persisted" do
           @klass.new.tap do |doc|
-            doc.should_receive(:persisted?).and_return(true)
+            expect(doc).to receive(:persisted?).and_return(true)
             doc.to_param.should == doc.id.to_s
           end
         end
@@ -178,7 +178,7 @@ describe "Rails integration" do
 
         it "should array representation of id if persisted" do
           @klass.new.tap do |doc|
-            doc.should_receive(:persisted?).and_return(true)
+            expect(doc).to receive(:persisted?).and_return(true)
             doc.to_key.should == [doc.id]
           end
         end

data/spec/unit/serialization_spec.rb

@@ -151,7 +151,7 @@ module Serialization
 
           @instance.name.should == unserialized.name
           @instance.age.should == unserialized.age
-          unserialized.awesome.should be_false
+          unserialized.awesome.should be_falsey
           unserialized.created_at.should be_nil
         end
 

data/spec/unit/time_zones_spec.rb

@@ -25,7 +25,7 @@ describe "TimeZones" do
       Time.zone = 'UTC'
 
       doc = @document.new(:created_at => "2009-08-15 14:00:00")
-      doc.created_at.is_a?(ActiveSupport::TimeWithZone).should be_true
+      doc.created_at.is_a?(ActiveSupport::TimeWithZone).should be_truthy
       doc.created_at.should == Time.utc(2009, 8, 15, 14)
 
       Time.zone = nil
@@ -35,7 +35,7 @@ describe "TimeZones" do
       Time.zone = 'Hawaii'
 
       doc = @document.new(:created_at => "2009-08-15 14:00:00")
-      doc.created_at.is_a?(ActiveSupport::TimeWithZone).should be_true
+      doc.created_at.is_a?(ActiveSupport::TimeWithZone).should be_truthy
       doc.created_at.should == Time.utc(2009, 8, 16)
 
       Time.zone = nil

data/spec/unit/validations_spec.rb

@@ -27,7 +27,7 @@ describe "Validations" do
           doc = @document.new
           doc.password = 'foobar'
           doc.password_confirmation = 'foobar1'
-          doc.should have_error_on(:password_confirmation).or(:password)
+          doc.should have_error_on(:password).or(have_error_on(:password_confirmation))
 
           doc.password_confirmation = 'foobar'
           doc.should_not have_error_on(:password)
@@ -190,7 +190,8 @@ describe "Validations" do
           doc.should_not have_error_on(:action)
 
           doc.action = 'kick'
-          doc.should have_error_on(:action, 'is reserved')
+          doc.should have_error_on(:action)
+          doc.errors[:action].should == ['is reserved']
         end
 
         it "should work with :not_in shortcut on key definition" do
@@ -203,7 +204,8 @@ describe "Validations" do
           doc.should_not have_error_on(:action)
 
           doc.action = 'kick'
-          doc.should have_error_on(:action, 'is reserved')
+          doc.should have_error_on(:action)
+          doc.errors[:action].should == ['is reserved']
         end
 
         it "should not have error if allow nil is true and value is nil" do
@@ -236,10 +238,12 @@ describe "Validations" do
           @document.validates_inclusion_of :action, :in => %w(kick run)
 
           doc = @document.new
-          doc.should have_error_on(:action, 'is not included in the list')
+          doc.should have_error_on(:action)
+          doc.errors[:action].should == ['is not included in the list']
 
           doc.action = 'fart'
-          doc.should have_error_on(:action, 'is not included in the list')
+          doc.should have_error_on(:action)
+          doc.errors[:action].should == ['is not included in the list']
 
           doc.action = 'kick'
           doc.should_not have_error_on(:action)
@@ -249,10 +253,12 @@ describe "Validations" do
           @document.key :action, String, :in => %w(kick run)
 
           doc = @document.new
-          doc.should have_error_on(:action, 'is not included in the list')
+          doc.should have_error_on(:action)
+          doc.errors[:action].should == ['is not included in the list']
 
           doc.action = 'fart'
-          doc.should have_error_on(:action, 'is not included in the list')
+          doc.should have_error_on(:action)
+          doc.errors[:action].should == ['is not included in the list']
 
           doc.action = 'kick'
           doc.should_not have_error_on(:action)
@@ -262,7 +268,8 @@ describe "Validations" do
           @document.key :flag, Boolean, :required => true
 
           doc = @document.new
-          doc.should have_error_on(:flag, 'is not included in the list')
+          doc.should have_error_on(:flag)
+          doc.errors[:flag].should == ['is not included in the list']
 
           doc.flag = true
           doc.should_not have_error_on(:action)
@@ -313,7 +320,7 @@ describe "Validations" do
           doc = @embedded_doc.new
           doc.password = 'foobar'
           doc.password_confirmation = 'foobar1'
-          doc.should have_error_on(:password).or(:password_confirmation)
+          doc.should have_error_on(:password).or(have_error_on(:password_confirmation))
           doc.password_confirmation = 'foobar'
           doc.should_not have_error_on(:password)
         end
@@ -462,7 +469,8 @@ describe "Validations" do
           doc.should_not have_error_on(:action)
 
           doc.action = 'kick'
-          doc.should have_error_on(:action, 'is reserved')
+          doc.should have_error_on(:action)
+          doc.errors[:action].should == ['is reserved']
         end
 
         it "should work with :not_in shortcut on key definition" do
@@ -475,7 +483,8 @@ describe "Validations" do
           doc.should_not have_error_on(:action)
 
           doc.action = 'kick'
-          doc.should have_error_on(:action, 'is reserved')
+          doc.should have_error_on(:action)
+          doc.errors[:action].should == ['is reserved']
         end
 
         it "should not have error if allow nil is true and value is nil" do
@@ -508,10 +517,12 @@ describe "Validations" do
           @embedded_doc.validates_inclusion_of :action, :in => %w(kick run)
 
           doc = @embedded_doc.new
-          doc.should have_error_on(:action, 'is not included in the list')
+          doc.should have_error_on(:action)
+          doc.errors[:action].should == ['is not included in the list']
 
           doc.action = 'fart'
-          doc.should have_error_on(:action, 'is not included in the list')
+          doc.should have_error_on(:action)
+          doc.errors[:action].should == ['is not included in the list']
 
           doc.action = 'kick'
           doc.should_not have_error_on(:action)
@@ -521,10 +532,12 @@ describe "Validations" do
           @embedded_doc.key :action, String, :in => %w(kick run)
 
           doc = @embedded_doc.new
-          doc.should have_error_on(:action, 'is not included in the list')
+          doc.should have_error_on(:action)
+          doc.errors[:action].should == ['is not included in the list']
 
           doc.action = 'fart'
-          doc.should have_error_on(:action, 'is not included in the list')
+          doc.should have_error_on(:action)
+          doc.errors[:action].should == ['is not included in the list']
 
           doc.action = 'kick'
           doc.should_not have_error_on(:action)