mongoid 3.1.7 → 4.0.2

data/spec/mongoid/extensions/array_spec.rb

@@ -7,7 +7,7 @@ describe Mongoid::Extensions::Array do
     context "when provided an array of strings" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:other) do
@@ -23,18 +23,18 @@ describe Mongoid::Extensions::Array do
       end
 
       it "converts the convertible ones to object ids" do
-        evolved.should eq([ object_id, other ])
+        expect(evolved).to eq([ object_id, other ])
       end
 
       it "returns the same instance" do
-        evolved.should equal(array)
+        expect(evolved).to equal(array)
       end
     end
 
     context "when provided an array of object ids" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:array) do
@@ -46,18 +46,18 @@ describe Mongoid::Extensions::Array do
       end
 
       it "returns the array" do
-        evolved.should eq(array)
+        expect(evolved).to eq(array)
       end
 
       it "returns the same instance" do
-        evolved.should equal(array)
+        expect(evolved).to equal(array)
       end
     end
 
     context "when some values are nil" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:array) do
@@ -69,18 +69,18 @@ describe Mongoid::Extensions::Array do
       end
 
       it "returns the array with the nils" do
-        evolved.should eq([ object_id, nil ])
+        expect(evolved).to eq([ object_id, nil ])
       end
 
       it "returns the same instance" do
-        evolved.should equal(array)
+        expect(evolved).to equal(array)
       end
     end
 
     context "when some values are empty strings" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:array) do
@@ -92,11 +92,11 @@ describe Mongoid::Extensions::Array do
       end
 
       it "returns the array with the empty strings" do
-        evolved.should eq([ object_id, "" ])
+        expect(evolved).to eq([ object_id, "" ])
       end
 
       it "returns the same instance" do
-        evolved.should equal(array)
+        expect(evolved).to equal(array)
       end
     end
   end
@@ -106,7 +106,7 @@ describe Mongoid::Extensions::Array do
     context "when provided an array of strings" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:other) do
@@ -122,18 +122,18 @@ describe Mongoid::Extensions::Array do
       end
 
       it "converts the convertible ones to object ids" do
-        mongoized.should eq([ object_id, other ])
+        expect(mongoized).to eq([ object_id, other ])
       end
 
       it "returns the same instance" do
-        mongoized.should equal(array)
+        expect(mongoized).to equal(array)
       end
     end
 
     context "when provided an array of object ids" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:array) do
@@ -145,18 +145,18 @@ describe Mongoid::Extensions::Array do
       end
 
       it "returns the array" do
-        mongoized.should eq(array)
+        expect(mongoized).to eq(array)
       end
 
       it "returns the same instance" do
-        mongoized.should equal(array)
+        expect(mongoized).to equal(array)
       end
     end
 
     context "when some values are nil" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:array) do
@@ -168,18 +168,18 @@ describe Mongoid::Extensions::Array do
       end
 
       it "returns the array without the nils" do
-        mongoized.should eq([ object_id ])
+        expect(mongoized).to eq([ object_id ])
       end
 
       it "returns the same instance" do
-        mongoized.should equal(array)
+        expect(mongoized).to equal(array)
       end
     end
 
     context "when some values are empty strings" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:array) do
@@ -191,11 +191,11 @@ describe Mongoid::Extensions::Array do
       end
 
       it "returns the array without the empty strings" do
-        mongoized.should eq([ object_id ])
+        expect(mongoized).to eq([ object_id ])
       end
 
       it "returns the same instance" do
-        mongoized.should equal(array)
+        expect(mongoized).to equal(array)
       end
     end
   end
@@ -215,7 +215,7 @@ describe Mongoid::Extensions::Array do
       context "when provided an object id" do
 
         let(:object_id) do
-          Moped::BSON::ObjectId.new
+          BSON::ObjectId.new
         end
 
         let(:fk) do
@@ -223,14 +223,14 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns the object id as an array" do
-          fk.should eq([ object_id ])
+          expect(fk).to eq([ object_id ])
         end
       end
 
       context "when provided a object ids" do
 
         let(:object_id) do
-          Moped::BSON::ObjectId.new
+          BSON::ObjectId.new
         end
 
         let(:fk) do
@@ -238,7 +238,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns the object ids" do
-          fk.should eq([ object_id ])
+          expect(fk).to eq([ object_id ])
         end
       end
 
@@ -247,7 +247,7 @@ describe Mongoid::Extensions::Array do
         context "when the string is a legal object id" do
 
           let(:object_id) do
-            Moped::BSON::ObjectId.new
+            BSON::ObjectId.new
           end
 
           let(:fk) do
@@ -255,7 +255,7 @@ describe Mongoid::Extensions::Array do
           end
 
           it "returns the object id in an array" do
-            fk.should eq([ object_id ])
+            expect(fk).to eq([ object_id ])
           end
         end
 
@@ -270,7 +270,7 @@ describe Mongoid::Extensions::Array do
           end
 
           it "returns the string in an array" do
-            fk.should eq([ string ])
+            expect(fk).to eq([ string ])
           end
         end
 
@@ -281,7 +281,7 @@ describe Mongoid::Extensions::Array do
           end
 
           it "returns an empty array" do
-            fk.should be_empty
+            expect(fk).to be_empty
           end
         end
       end
@@ -293,7 +293,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns an empty array" do
-          fk.should be_empty
+          expect(fk).to be_empty
         end
       end
 
@@ -302,7 +302,7 @@ describe Mongoid::Extensions::Array do
         context "when the strings are legal object ids" do
 
           let(:object_id) do
-            Moped::BSON::ObjectId.new
+            BSON::ObjectId.new
           end
 
           let(:fk) do
@@ -310,7 +310,7 @@ describe Mongoid::Extensions::Array do
           end
 
           it "returns the object id in an array" do
-            fk.should eq([ object_id ])
+            expect(fk).to eq([ object_id ])
           end
         end
 
@@ -325,7 +325,7 @@ describe Mongoid::Extensions::Array do
           end
 
           it "returns the string in an array" do
-            fk.should eq([ string ])
+            expect(fk).to eq([ string ])
           end
         end
 
@@ -336,7 +336,7 @@ describe Mongoid::Extensions::Array do
           end
 
           it "returns an empty array" do
-            fk.should be_empty
+            expect(fk).to be_empty
           end
         end
       end
@@ -348,7 +348,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns an empty array" do
-          fk.should be_empty
+          expect(fk).to be_empty
         end
       end
     end
@@ -376,11 +376,11 @@ describe Mongoid::Extensions::Array do
       end
 
       it "converts to a time" do
-        time.should eq(::Time.zone.local(*array))
+        expect(time).to eq(::Time.zone.local(*array))
       end
 
       it "converts to the as time zone" do
-        time.zone.should eq("JST")
+        expect(time.zone).to eq("JST")
       end
     end
 
@@ -404,7 +404,7 @@ describe Mongoid::Extensions::Array do
       end
 
       it "converts to a time" do
-        time.should eq(Time.local(*array))
+        expect(time).to eq(Time.local(*array))
       end
     end
   end
@@ -420,7 +420,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns true" do
-          array.should be_blank_criteria
+          expect(array).to be_blank_criteria
         end
       end
 
@@ -431,7 +431,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns true" do
-          array.should be_blank_criteria
+          expect(array).to be_blank_criteria
         end
       end
     end
@@ -450,7 +450,7 @@ describe Mongoid::Extensions::Array do
       end
 
       it "returns nil" do
-        deleted.should be_nil
+        expect(deleted).to be_nil
       end
     end
 
@@ -465,11 +465,11 @@ describe Mongoid::Extensions::Array do
       end
 
       it "deletes the object" do
-        array.should eq([ "2" ])
+        expect(array).to eq([ "2" ])
       end
 
       it "returns the object" do
-        deleted.should eq("1")
+        expect(deleted).to eq("1")
       end
     end
 
@@ -484,11 +484,11 @@ describe Mongoid::Extensions::Array do
       end
 
       it "deletes the first object" do
-        array.should eq([ "2", "1" ])
+        expect(array).to eq([ "2", "1" ])
       end
 
       it "returns the object" do
-        deleted.should eq("1")
+        expect(deleted).to eq("1")
       end
     end
   end
@@ -500,7 +500,7 @@ describe Mongoid::Extensions::Array do
     end
 
     it "returns the array" do
-      Array.demongoize(array).should eq(array)
+      expect(Array.demongoize(array)).to eq(array)
     end
   end
 
@@ -519,11 +519,11 @@ describe Mongoid::Extensions::Array do
     end
 
     it "mongoizes each element in the array" do
-      mongoized.first.should be_a(Time)
+      expect(mongoized.first).to be_a(Time)
     end
 
     it "converts the elements properly" do
-      mongoized.first.should eq(date)
+      expect(mongoized.first).to eq(Time.utc(2012, 1, 1, 0, 0, 0))
     end
   end
 
@@ -542,11 +542,11 @@ describe Mongoid::Extensions::Array do
     end
 
     it "mongoizes each element in the array" do
-      mongoized.first.should be_a(Time)
+      expect(mongoized.first).to be_a(Time)
     end
 
     it "converts the elements properly" do
-      mongoized.first.should eq(date)
+      expect(mongoized.first).to eq(Time.utc(2012, 1, 1, 0, 0, 0))
     end
   end
 
@@ -559,7 +559,7 @@ describe Mongoid::Extensions::Array do
       end
 
       it "returns true" do
-        array.should be_multi_arged
+        expect(array).to be_multi_arged
       end
     end
 
@@ -572,7 +572,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns false" do
-          array.should_not be_multi_arged
+          expect(array).to_not be_multi_arged
         end
       end
 
@@ -583,7 +583,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns false" do
-          array.should_not be_multi_arged
+          expect(array).to_not be_multi_arged
         end
       end
 
@@ -594,7 +594,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns true" do
-          array.should be_multi_arged
+          expect(array).to be_multi_arged
         end
       end
 
@@ -605,7 +605,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns true" do
-          array.should be_multi_arged
+          expect(array).to be_multi_arged
         end
       end
 
@@ -616,7 +616,7 @@ describe Mongoid::Extensions::Array do
         end
 
         it "returns true" do
-          array.should be_multi_arged
+          expect(array).to be_multi_arged
         end
       end
     end
@@ -625,14 +625,14 @@ describe Mongoid::Extensions::Array do
   describe ".resizable?" do
 
     it "returns true" do
-      Array.should be_resizable
+      expect(Array).to be_resizable
     end
   end
 
   describe "#resiable?" do
 
     it "returns true" do
-      [].should be_resizable
+      expect([]).to be_resizable
     end
   end
 end

data/spec/mongoid/extensions/big_decimal_spec.rb

@@ -11,14 +11,14 @@ describe Mongoid::Extensions::BigDecimal do
     context "when the the value is a string" do
 
       it "returns a big decimal" do
-        BigDecimal.demongoize(number.to_s).should eq(number)
+        expect(BigDecimal.demongoize(number.to_s)).to eq(number)
       end
     end
 
     context "when the value is nil" do
 
       it "returns nil" do
-        BigDecimal.demongoize(nil).should be_nil
+        expect(BigDecimal.demongoize(nil)).to be_nil
       end
     end
 
@@ -29,7 +29,7 @@ describe Mongoid::Extensions::BigDecimal do
       end
 
       it "returns a float" do
-        BigDecimal.demongoize(float).should eq(float)
+        expect(BigDecimal.demongoize(float)).to eq(float)
       end
     end
 
@@ -40,7 +40,7 @@ describe Mongoid::Extensions::BigDecimal do
       end
 
       it "returns an integer" do
-        BigDecimal.demongoize(integer).should eq(integer)
+        expect(BigDecimal.demongoize(integer)).to eq(integer)
       end
     end
 
@@ -55,11 +55,11 @@ describe Mongoid::Extensions::BigDecimal do
       end
 
       it "returns a big decimal" do
-        demongoized.should be_a(BigDecimal)
+        expect(demongoized).to be_a(BigDecimal)
       end
 
       it "is a NaN big decimal" do
-        demongoized.should be_nan
+        expect(demongoized).to be_nan
       end
     end
   end
@@ -69,28 +69,28 @@ describe Mongoid::Extensions::BigDecimal do
     context "when the value is a big decimal" do
 
       it "returns a string" do
-        BigDecimal.mongoize(number).should eq(number.to_s)
+        expect(BigDecimal.mongoize(number)).to eq(number.to_s)
       end
     end
 
     context "when the value is nil" do
 
       it "returns nil" do
-        BigDecimal.mongoize(nil).should be_nil
+        expect(BigDecimal.mongoize(nil)).to be_nil
       end
     end
 
     context "when the value is an integer" do
 
       it "returns a string" do
-        BigDecimal.mongoize(123456).should eq("123456")
+        expect(BigDecimal.mongoize(123456)).to eq("123456")
       end
     end
 
     context "when the value is a float" do
 
       it "returns a string" do
-        BigDecimal.mongoize(123456.789).should eq("123456.789")
+        expect(BigDecimal.mongoize(123456.789)).to eq("123456.789")
       end
     end
   end
@@ -98,7 +98,7 @@ describe Mongoid::Extensions::BigDecimal do
   describe "#mongoize" do
 
     it "returns a string" do
-      number.mongoize.should eq(number.to_s)
+      expect(number.mongoize).to eq(number.to_s)
     end
   end
 end

data/spec/mongoid/extensions/binary_spec.rb

@@ -1,60 +1,60 @@
 require "spec_helper"
 
-describe Moped::BSON::Binary do
+describe BSON::Binary do
 
   describe "#mongoize" do
 
     let(:binary) do
-      Moped::BSON::Binary.new(:md5, "testing")
+      BSON::Binary.new("testing", :md5)
     end
 
     it "returns the binary" do
-      binary.mongoize.should eq(binary)
+      expect(binary.mongoize).to eq(binary)
     end
   end
 
   describe ".demongoize" do
 
     let(:binary) do
-      Moped::BSON::Binary.new(:md5, "testing")
+      BSON::Binary.new("testing", :md5)
     end
 
     let(:demongoized) do
-      Moped::BSON::Binary.demongoize(binary)
+      BSON::Binary.demongoize(binary)
     end
 
     it "returns the binary" do
-      demongoized.should eq(binary)
+      expect(demongoized).to eq(binary)
     end
   end
 
   describe ".evolve" do
 
     let(:binary) do
-      Moped::BSON::Binary.new(:md5, "testing")
+      BSON::Binary.new("testing", :md5)
     end
 
     let(:evolved) do
-      Moped::BSON::Binary.evolve(binary)
+      BSON::Binary.evolve(binary)
     end
 
     it "returns the binary" do
-      evolved.should eq(binary)
+      expect(evolved).to eq(binary)
     end
   end
 
   describe ".mongoize" do
 
     let(:binary) do
-      Moped::BSON::Binary.new(:md5, "testing")
+      BSON::Binary.new("testing", :md5)
     end
 
     let(:mongoized) do
-      Moped::BSON::Binary.mongoize(binary)
+      BSON::Binary.mongoize(binary)
     end
 
     it "returns the binary" do
-      mongoized.should eq(binary)
+      expect(mongoized).to eq(binary)
     end
   end
 end