mongoid 3.1.7 → 4.0.0.alpha1

data/spec/mongoid/extensions/false_class_spec.rb

@@ -5,7 +5,7 @@ describe Mongoid::Extensions::FalseClass do
   describe "#__sortable__" do
 
     it "returns 0" do
-      false.__sortable__.should eq(0)
+      expect(false.__sortable__).to eq(0)
     end
   end
 
@@ -14,28 +14,28 @@ describe Mongoid::Extensions::FalseClass do
     context "when provided a Boolean" do
 
       it "returns true" do
-        false.is_a?(Boolean).should be_true
+        expect(false.is_a?(Boolean)).to be true
       end
     end
 
     context "when provided a FalseClass" do
 
       it "returns true" do
-        false.is_a?(FalseClass).should be_true
+        expect(false.is_a?(FalseClass)).to be true
       end
     end
 
     context "when provided a TrueClass" do
 
       it "returns false" do
-        false.is_a?(TrueClass).should be_false
+        expect(false.is_a?(TrueClass)).to be false
       end
     end
 
     context "when provided an invalid class" do
 
       it "returns false" do
-        false.is_a?(String).should be_false
+        expect(false.is_a?(String)).to be false
       end
     end
   end

data/spec/mongoid/extensions/float_spec.rb

@@ -17,7 +17,7 @@ describe Mongoid::Extensions::Float do
     end
 
     it "returns the float as a time" do
-      mongoized.should eq(Time.at(float))
+      expect(mongoized).to eq(Time.at(float))
     end
   end
 
@@ -26,14 +26,28 @@ describe Mongoid::Extensions::Float do
     context "when the the value is a float" do
 
       it "returns a float" do
-        Float.demongoize(number).should eq(number)
+        expect(Float.demongoize(number)).to eq(number)
       end
     end
 
     context "when the value is nil" do
 
       it "returns nil" do
-        Float.demongoize(nil).should be_nil
+        expect(Float.demongoize(nil)).to be_nil
+      end
+    end
+
+    context "when the value is a float string" do
+
+      it "returns a float" do
+        expect(Float.demongoize(number.to_s)).to eq(number)
+      end
+    end
+
+    context "when the value is not a float string" do
+
+      it "returns a float" do
+        expect(Float.demongoize('asdf')).to eq(0)
       end
     end
   end
@@ -47,18 +61,18 @@ describe Mongoid::Extensions::Float do
         context "when the value is small" do
 
           it "it returns the float" do
-            Float.mongoize(3).should eq(3)
+            expect(Float.mongoize(3)).to eq(3)
           end
 
           it "returns the number as type float" do
-            Float.mongoize(3).should be_a(Float)
+            expect(Float.mongoize(3)).to be_a(Float)
           end
         end
 
         context "when the value is large" do
 
           it "returns the float" do
-            Float.mongoize(1024**2).to_s.should eq("1048576.0")
+            expect(Float.mongoize(1024**2).to_s).to eq("1048576.0")
           end
         end
       end
@@ -66,28 +80,28 @@ describe Mongoid::Extensions::Float do
       context "when the value is a decimal" do
 
         it "casts to float" do
-          Float.mongoize(2.5).should eq(2.5)
+          expect(Float.mongoize(2.5)).to eq(2.5)
         end
       end
 
       context "when the value is floating point zero" do
 
         it "returns the float zero" do
-          Float.mongoize(0.00000).should eq(0)
+          expect(Float.mongoize(0.00000)).to eq(0)
         end
       end
 
       context "when the value is a floating point float" do
 
         it "returns the float number" do
-          Float.mongoize(4.00000).should eq(4)
+          expect(Float.mongoize(4.00000)).to eq(4)
         end
       end
 
       context "when the value has leading zeros" do
 
         it "returns the stripped float" do
-          Float.mongoize("000011").should eq(11)
+          expect(Float.mongoize("000011")).to eq(11)
         end
       end
     end
@@ -97,28 +111,28 @@ describe Mongoid::Extensions::Float do
       context "when the string is non numerical" do
 
         it "returns 0" do
-          Float.mongoize("foo").should eq(0.0)
+          expect(Float.mongoize("foo")).to eq(0.0)
         end
       end
 
       context "when the string is numerical" do
 
         it "returns the float value for the string" do
-          Float.mongoize("3").should eq(3)
+          expect(Float.mongoize("3")).to eq(3)
         end
       end
 
       context "when the string is empty" do
 
         it "returns nil" do
-          Float.mongoize("").should be_nil
+          expect(Float.mongoize("")).to be_nil
         end
       end
 
       context "when the string is nil" do
 
         it "returns nil" do
-          Float.mongoize(nil).should be_nil
+          expect(Float.mongoize(nil)).to be_nil
         end
       end
     end
@@ -127,7 +141,7 @@ describe Mongoid::Extensions::Float do
   describe "#mongoize" do
 
     it "returns self" do
-      number.mongoize.should eq(number)
+      expect(number.mongoize).to eq(number)
     end
   end
 end

data/spec/mongoid/extensions/hash_spec.rb

@@ -7,7 +7,7 @@ describe Mongoid::Extensions::Hash do
     context "when values have object id strings" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:hash) do
@@ -19,14 +19,14 @@ describe Mongoid::Extensions::Hash do
       end
 
       it "converts each value in the hash" do
-        evolved[:field].should eq(object_id)
+        expect(evolved[:field]).to eq(object_id)
       end
     end
 
     context "when values have object ids" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:hash) do
@@ -38,14 +38,14 @@ describe Mongoid::Extensions::Hash do
       end
 
       it "converts each value in the hash" do
-        evolved[:field].should eq(object_id)
+        expect(evolved[:field]).to eq(object_id)
       end
     end
 
     context "when values have empty strings" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:hash) do
@@ -57,14 +57,14 @@ describe Mongoid::Extensions::Hash do
       end
 
       it "retains the empty string values" do
-        evolved[:field].should be_empty
+        expect(evolved[:field]).to be_empty
       end
     end
 
     context "when values have nils" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:hash) do
@@ -76,7 +76,7 @@ describe Mongoid::Extensions::Hash do
       end
 
       it "retains the nil values" do
-        evolved[:field].should be_nil
+        expect(evolved[:field]).to be_nil
       end
     end
   end
@@ -86,7 +86,7 @@ describe Mongoid::Extensions::Hash do
     context "when values have object id strings" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:hash) do
@@ -98,14 +98,14 @@ describe Mongoid::Extensions::Hash do
       end
 
       it "converts each value in the hash" do
-        mongoized[:field].should eq(object_id)
+        expect(mongoized[:field]).to eq(object_id)
       end
     end
 
     context "when values have object ids" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:hash) do
@@ -117,14 +117,14 @@ describe Mongoid::Extensions::Hash do
       end
 
       it "converts each value in the hash" do
-        mongoized[:field].should eq(object_id)
+        expect(mongoized[:field]).to eq(object_id)
       end
     end
 
     context "when values have empty strings" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:hash) do
@@ -136,14 +136,14 @@ describe Mongoid::Extensions::Hash do
       end
 
       it "converts the empty strings to nil" do
-        mongoized[:field].should be_nil
+        expect(mongoized[:field]).to be_nil
       end
     end
 
     context "when values have nils" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:hash) do
@@ -155,7 +155,7 @@ describe Mongoid::Extensions::Hash do
       end
 
       it "retains the nil values" do
-        mongoized[:field].should be_nil
+        expect(mongoized[:field]).to be_nil
       end
     end
   end
@@ -175,7 +175,7 @@ describe Mongoid::Extensions::Hash do
         end
 
         it "moves the non hash values under the provided key" do
-          consolidated.should eq({
+          expect(consolidated).to eq({
             "$set" => { name: "Tool", likes: 10 }, "$inc" => { plays: 1 }
           })
         end
@@ -192,7 +192,7 @@ describe Mongoid::Extensions::Hash do
         end
 
         it "moves the non hash values under the provided key" do
-          consolidated.should eq({
+          expect(consolidated).to eq({
             "$set" => { likes: 10, name: "Tool" }, "$inc" => { plays: 1 }
           })
         end
@@ -210,7 +210,7 @@ describe Mongoid::Extensions::Hash do
       end
 
       it "moves the non hash values under the provided key" do
-        consolidated.should eq({
+        expect(consolidated).to eq({
           "$set" => { likes: 10, name: "Tool" }, "$inc" => { plays: 1 }
         })
       end
@@ -228,7 +228,7 @@ describe Mongoid::Extensions::Hash do
     end
 
     it "should retrieve a nested value under the provided key" do
-      nested.should eq "hundred"
+      expect(nested).to eq "hundred"
     end
   end
 
@@ -243,7 +243,7 @@ describe Mongoid::Extensions::Hash do
     end
 
     it "should retrieve a nested value under the provided key" do
-      nested.should eq("hundred")
+      expect(nested).to eq("hundred")
     end
   end
 
@@ -254,7 +254,7 @@ describe Mongoid::Extensions::Hash do
     end
 
     it "returns the hash" do
-      Hash.demongoize(hash).should eq(hash)
+      expect(Hash.demongoize(hash)).to eq(hash)
     end
   end
 
@@ -275,11 +275,11 @@ describe Mongoid::Extensions::Hash do
       end
 
       it "mongoizes each element in the hash" do
-        mongoized[:date].should be_a(Time)
+        expect(mongoized[:date]).to be_a(Time)
       end
 
       it "converts the elements properly" do
-        mongoized[:date].should eq(date)
+        expect(mongoized[:date]).to eq(Time.utc(2012, 1, 1, 0, 0, 0))
       end
     end
 
@@ -289,7 +289,7 @@ describe Mongoid::Extensions::Hash do
       end
 
       it "returns nil" do
-        mongoized.should be_nil
+        expect(mongoized).to be_nil
       end
     end
   end
@@ -309,25 +309,25 @@ describe Mongoid::Extensions::Hash do
     end
 
     it "mongoizes each element in the hash" do
-      mongoized[:date].should be_a(Time)
+      expect(mongoized[:date]).to be_a(Time)
     end
 
     it "converts the elements properly" do
-      mongoized[:date].should eq(date)
+      expect(mongoized[:date]).to eq(Time.utc(2012, 1, 1, 0, 0, 0))
     end
   end
 
   describe "#resizable?" do
 
     it "returns true" do
-      {}.should be_resizable
+      expect({}).to be_resizable
     end
   end
 
   describe ".resizable?" do
 
     it "returns true" do
-      Hash.should be_resizable
+      expect(Hash).to be_resizable
     end
   end
 end

data/spec/mongoid/extensions/integer_spec.rb

@@ -17,7 +17,7 @@ describe Mongoid::Extensions::Integer do
     end
 
     it "returns the float as a time" do
-      mongoized.should eq(Time.at(integer))
+      expect(mongoized).to eq(Time.at(integer))
     end
   end
 
@@ -26,21 +26,21 @@ describe Mongoid::Extensions::Integer do
     context "when the the value is an integer" do
 
       it "returns a integer" do
-        Integer.demongoize(number).should eq(number)
+        expect(Integer.demongoize(number)).to eq(number)
       end
     end
 
     context "when the value is nil" do
 
       it "returns nil" do
-        Integer.demongoize(nil).should be_nil
+        expect(Integer.demongoize(nil)).to be_nil
       end
     end
 
     context "when the value is not an integer" do
 
       it "converts the value to an integer" do
-        Integer.demongoize("1.0").should eq(1)
+        expect(Integer.demongoize("1.0")).to eq(1)
       end
     end
   end
@@ -54,14 +54,14 @@ describe Mongoid::Extensions::Integer do
         context "when the value is small" do
 
           it "it returns the integer" do
-            Integer.mongoize(3).should eq(3)
+            expect(Integer.mongoize(3)).to eq(3)
           end
         end
 
         context "when the value is large" do
 
           it "returns the integer" do
-            Integer.mongoize(1024**2).to_s.should eq("1048576")
+            expect(Integer.mongoize(1024**2).to_s).to eq("1048576")
           end
         end
       end
@@ -69,28 +69,28 @@ describe Mongoid::Extensions::Integer do
       context "when the value is a decimal" do
 
         it "casts to integer" do
-          Integer.mongoize(2.5).should eq(2)
+          expect(Integer.mongoize(2.5)).to eq(2)
         end
       end
 
       context "when the value is floating point zero" do
 
         it "returns the integer zero" do
-          Integer.mongoize(0.00000).should eq(0)
+          expect(Integer.mongoize(0.00000)).to eq(0)
         end
       end
 
       context "when the value is a floating point integer" do
 
         it "returns the integer number" do
-          Integer.mongoize(4.00000).should eq(4)
+          expect(Integer.mongoize(4.00000)).to eq(4)
         end
       end
 
       context "when the value has leading zeros" do
 
         it "returns the stripped integer" do
-          Integer.mongoize("000011").should eq(11)
+          expect(Integer.mongoize("000011")).to eq(11)
         end
       end
     end
@@ -100,28 +100,28 @@ describe Mongoid::Extensions::Integer do
       context "when the string is non numerical" do
 
         it "returns 0" do
-          Integer.mongoize("foo").should eq(0)
+          expect(Integer.mongoize("foo")).to eq(0)
         end
       end
 
       context "when the string is numerical" do
 
         it "returns the integer value for the string" do
-          Integer.mongoize("3").should eq(3)
+          expect(Integer.mongoize("3")).to eq(3)
         end
       end
 
       context "when the string is empty" do
 
         it "returns nil" do
-          Integer.mongoize("").should be_nil
+          expect(Integer.mongoize("")).to be_nil
         end
       end
 
       context "when the string is nil" do
 
         it "returns nil" do
-          Integer.mongoize(nil).should be_nil
+          expect(Integer.mongoize(nil)).to be_nil
         end
       end
     end
@@ -130,7 +130,7 @@ describe Mongoid::Extensions::Integer do
   describe "#mongoize" do
 
     it "returns self" do
-      number.mongoize.should eq(number)
+      expect(number.mongoize).to eq(number)
     end
   end
 end