mongoid 3.1.7 → 4.0.0.alpha1

data/spec/mongoid/extensions/true_class_spec.rb

@@ -5,7 +5,7 @@ describe Mongoid::Extensions::TrueClass do
   describe "#__sortable__" do
 
     it "returns 1" do
-      true.__sortable__.should eq(1)
+      expect(true.__sortable__).to eq(1)
     end
   end
 
@@ -14,28 +14,28 @@ describe Mongoid::Extensions::TrueClass do
     context "when provided a Boolean" do
 
       it "returns true" do
-        true.is_a?(Boolean).should be_true
+        expect(true.is_a?(Boolean)).to be true
       end
     end
 
     context "when provided a FalseClass" do
 
       it "returns false" do
-        true.is_a?(FalseClass).should be_false
+        expect(true.is_a?(FalseClass)).to be false
       end
     end
 
     context "when provided a TrueClass" do
 
       it "returns true" do
-        true.is_a?(TrueClass).should be_true
+        expect(true.is_a?(TrueClass)).to be true
       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_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+describe BSON::ObjectId do
+
+  describe "#as_json" do
+
+    let(:object_id) do
+      described_class.new
+    end
+
+    it "returns the $oid plus string" do
+      expect(object_id.as_json).to eq("$oid" => object_id.to_s)
+    end
+  end
+end

data/spec/mongoid/factory_spec.rb

@@ -17,7 +17,7 @@ describe Mongoid::Factory do
         end
 
         it "instantiates based on the type" do
-          person.title.should eq("Sir")
+          expect(person.title).to eq("Sir")
         end
       end
 
@@ -28,7 +28,7 @@ describe Mongoid::Factory do
         end
 
         it "instantiates the provided class" do
-          person.class.should eq(Person)
+          expect(person.class).to eq(Person)
         end
       end
 
@@ -39,7 +39,7 @@ describe Mongoid::Factory do
         end
 
         it "instantiates the subclass" do
-          person.class.should eq(Doctor)
+          expect(person.class).to eq(Doctor)
         end
       end
 
@@ -54,7 +54,7 @@ describe Mongoid::Factory do
         end
 
         it "instantiates based on the type" do
-          person.title.should eq("Sir")
+          expect(person.title).to eq("Sir")
         end
       end
 
@@ -69,7 +69,7 @@ describe Mongoid::Factory do
         end
 
         it "instantiates based on the type" do
-          person.title.should eq("Sir")
+          expect(person.title).to eq("Sir")
         end
       end
     end
@@ -85,7 +85,7 @@ describe Mongoid::Factory do
       end
 
       it "instantiates based on the provided class" do
-        person.title.should eq("Sir")
+        expect(person.title).to eq("Sir")
       end
     end
   end
@@ -99,11 +99,11 @@ describe Mongoid::Factory do
       end
 
       it "generates based on the provided class" do
-        document.should be_a(Address)
+        expect(document).to be_a(Address)
       end
 
       it "sets the attributes to empty" do
-        document.attributes.should be_empty
+        expect(document.attributes).to be_empty
       end
     end
 
@@ -120,11 +120,11 @@ describe Mongoid::Factory do
         end
 
         it "generates based on the type" do
-          document.should be_a(Person)
+          expect(document).to be_a(Person)
         end
 
         it "sets the attributes" do
-          document.title.should eq("Sir")
+          expect(document.title).to eq("Sir")
         end
       end
 
@@ -139,11 +139,11 @@ describe Mongoid::Factory do
         end
 
         it "generates based on the provided class" do
-          document.should be_a(Person)
+          expect(document).to be_a(Person)
         end
 
         it "sets the attributes" do
-          document.title.should eq("Sir")
+          expect(document.title).to eq("Sir")
         end
       end
 
@@ -158,7 +158,7 @@ describe Mongoid::Factory do
         end
 
         it "instantiates based on the type" do
-          person.title.should eq("Sir")
+          expect(person.title).to eq("Sir")
         end
       end
     end
@@ -174,11 +174,11 @@ describe Mongoid::Factory do
       end
 
       it "generates based on the provided class" do
-        document.should be_a(Person)
+        expect(document).to be_a(Person)
       end
 
       it "sets the attributes" do
-        document.title.should eq("Sir")
+        expect(document.title).to eq("Sir")
       end
     end
   end

data/spec/mongoid/fields/foreign_key_spec.rb

@@ -52,7 +52,7 @@ describe Mongoid::Fields::ForeignKey do
       end
 
       it "adds the current to the modifications" do
-        mods["preference_ids"].should eq(
+        expect(mods["preference_ids"]).to eq(
           [ preference_one.id, preference_three.id ]
         )
       end
@@ -62,7 +62,7 @@ describe Mongoid::Fields::ForeignKey do
   describe "#eval_default" do
 
     let(:default) do
-      [ Moped::BSON::ObjectId.new ]
+      [ BSON::ObjectId.new ]
     end
 
     let(:field) do
@@ -76,11 +76,11 @@ describe Mongoid::Fields::ForeignKey do
     end
 
     it "dups the default value" do
-      field.eval_default(Person.new).should_not equal(default)
+      expect(field.eval_default(Person.new)).to_not equal(default)
     end
 
     it "returns the correct value" do
-      field.eval_default(Person.new).should eq(default)
+      expect(field.eval_default(Person.new)).to eq(default)
     end
   end
 
@@ -97,7 +97,7 @@ describe Mongoid::Fields::ForeignKey do
     end
 
     it "returns true" do
-      field.should be_foreign_key
+      expect(field).to be_foreign_key
     end
   end
 
@@ -122,7 +122,7 @@ describe Mongoid::Fields::ForeignKey do
       end
 
       it "returns the id for the document" do
-        evolved.should eq(game.id)
+        expect(evolved).to eq(game.id)
       end
     end
 
@@ -137,7 +137,7 @@ describe Mongoid::Fields::ForeignKey do
         context "when the value is an id string" do
 
           let(:id) do
-            Moped::BSON::ObjectId.new
+            BSON::ObjectId.new
           end
 
           let(:evolved) do
@@ -145,7 +145,7 @@ describe Mongoid::Fields::ForeignKey do
           end
 
           it "converts the value to an object id" do
-            evolved.should eq(id)
+            expect(evolved).to eq(id)
           end
         end
 
@@ -156,7 +156,7 @@ describe Mongoid::Fields::ForeignKey do
           end
 
           it "does not convert the value" do
-            evolved.should eq("testing")
+            expect(evolved).to eq("testing")
           end
         end
 
@@ -167,7 +167,7 @@ describe Mongoid::Fields::ForeignKey do
           end
 
           it "does not convert the value" do
-            evolved.should be_empty
+            expect(evolved).to be_empty
           end
         end
       end
@@ -179,11 +179,11 @@ describe Mongoid::Fields::ForeignKey do
           context "when the relation stores ids as object ids" do
 
             let(:id_one) do
-              Moped::BSON::ObjectId.new
+              BSON::ObjectId.new
             end
 
             let(:id_two) do
-              Moped::BSON::ObjectId.new
+              BSON::ObjectId.new
             end
 
             let(:evolved) do
@@ -191,7 +191,7 @@ describe Mongoid::Fields::ForeignKey do
             end
 
             it "converts the value to an object id" do
-              evolved.should eq([ id_one, id_two ])
+              expect(evolved).to eq([ id_one, id_two ])
             end
           end
 
@@ -206,11 +206,11 @@ describe Mongoid::Fields::ForeignKey do
             end
 
             let(:id_one) do
-              Moped::BSON::ObjectId.new.to_s
+              BSON::ObjectId.new.to_s
             end
 
             let(:id_two) do
-              Moped::BSON::ObjectId.new.to_s
+              BSON::ObjectId.new.to_s
             end
 
             let(:evolved) do
@@ -218,7 +218,7 @@ describe Mongoid::Fields::ForeignKey do
             end
 
             it "does not convert the values to object ids" do
-              evolved.should eq([ id_one, id_two ])
+              expect(evolved).to eq([ id_one, id_two ])
             end
           end
         end
@@ -230,7 +230,7 @@ describe Mongoid::Fields::ForeignKey do
           end
 
           it "does not convert the value" do
-            evolved.should eq([ "testing" ])
+            expect(evolved).to eq([ "testing" ])
           end
         end
 
@@ -241,7 +241,7 @@ describe Mongoid::Fields::ForeignKey do
           end
 
           it "does not convert the value" do
-            evolved.should eq([ "" ])
+            expect(evolved).to eq([ "" ])
           end
         end
 
@@ -252,7 +252,7 @@ describe Mongoid::Fields::ForeignKey do
           end
 
           it "does not convert the value" do
-            evolved.should eq([ nil ])
+            expect(evolved).to eq([ nil ])
           end
         end
       end
@@ -275,7 +275,7 @@ describe Mongoid::Fields::ForeignKey do
           context "when the value is an id string" do
 
             let(:id) do
-              Moped::BSON::ObjectId.new
+              BSON::ObjectId.new
             end
 
             let(:evolved) do
@@ -283,7 +283,7 @@ describe Mongoid::Fields::ForeignKey do
             end
 
             it "converts the value to an object id" do
-              evolved.should eq(id)
+              expect(evolved).to eq(id)
             end
           end
 
@@ -294,7 +294,7 @@ describe Mongoid::Fields::ForeignKey do
             end
 
             it "does not convert the value" do
-              evolved.should eq("testing")
+              expect(evolved).to eq("testing")
             end
           end
 
@@ -305,7 +305,7 @@ describe Mongoid::Fields::ForeignKey do
             end
 
             it "does not convert the value" do
-              evolved.should be_empty
+              expect(evolved).to be_empty
             end
           end
         end
@@ -323,7 +323,7 @@ describe Mongoid::Fields::ForeignKey do
           context "when the value is an id string" do
 
             let(:id) do
-              Moped::BSON::ObjectId.new
+              BSON::ObjectId.new
             end
 
             let(:evolved) do
@@ -331,7 +331,7 @@ describe Mongoid::Fields::ForeignKey do
             end
 
             it "does not convert the value to an object id" do
-              evolved.should eq(id.to_s)
+              expect(evolved).to eq(id.to_s)
             end
           end
 
@@ -342,7 +342,7 @@ describe Mongoid::Fields::ForeignKey do
             end
 
             it "does not convert the value" do
-              evolved.should eq("testing")
+              expect(evolved).to eq("testing")
             end
           end
 
@@ -353,7 +353,7 @@ describe Mongoid::Fields::ForeignKey do
             end
 
             it "does not convert the value" do
-              evolved.should be_empty
+              expect(evolved).to be_empty
             end
           end
         end
@@ -366,11 +366,11 @@ describe Mongoid::Fields::ForeignKey do
           context "when the relation stores ids as object ids" do
 
             let(:id_one) do
-              Moped::BSON::ObjectId.new
+              BSON::ObjectId.new
             end
 
             let(:id_two) do
-              Moped::BSON::ObjectId.new
+              BSON::ObjectId.new
             end
 
             let(:evolved) do
@@ -378,7 +378,7 @@ describe Mongoid::Fields::ForeignKey do
             end
 
             it "converts the value to an object id" do
-              evolved.should eq([ id_one, id_two ])
+              expect(evolved).to eq([ id_one, id_two ])
             end
           end
 
@@ -393,11 +393,11 @@ describe Mongoid::Fields::ForeignKey do
             end
 
             let(:id_one) do
-              Moped::BSON::ObjectId.new.to_s
+              BSON::ObjectId.new.to_s
             end
 
             let(:id_two) do
-              Moped::BSON::ObjectId.new.to_s
+              BSON::ObjectId.new.to_s
             end
 
             let(:evolved) do
@@ -405,7 +405,7 @@ describe Mongoid::Fields::ForeignKey do
             end
 
             it "does not convert the values to object ids" do
-              evolved.should eq([ id_one, id_two ])
+              expect(evolved).to eq([ id_one, id_two ])
             end
           end
         end
@@ -417,7 +417,7 @@ describe Mongoid::Fields::ForeignKey do
           end
 
           it "does not convert the value" do
-            evolved.should eq([ "testing" ])
+            expect(evolved).to eq([ "testing" ])
           end
         end
 
@@ -428,7 +428,7 @@ describe Mongoid::Fields::ForeignKey do
           end
 
           it "does not convert the value" do
-            evolved.should eq([ "" ])
+            expect(evolved).to eq([ "" ])
           end
         end
 
@@ -439,7 +439,7 @@ describe Mongoid::Fields::ForeignKey do
           end
 
           it "does not convert the value" do
-            evolved.should eq([ nil ])
+            expect(evolved).to eq([ nil ])
           end
         end
       end
@@ -451,22 +451,22 @@ describe Mongoid::Fields::ForeignKey do
     context "when the key is resizable" do
 
       let(:field) do
-        described_class.new(:test, type: Array)
+        described_class.new(:test, type: Array, overwrite: true)
       end
 
       it "returns true" do
-        field.should be_lazy
+        expect(field).to be_lazy
       end
     end
 
     context "when the key is not resizable" do
 
       let(:field) do
-        described_class.new(:test, type: Moped::BSON::ObjectId)
+        described_class.new(:test, type: BSON::ObjectId, overwrite: true)
       end
 
       it "returns false" do
-        field.should_not be_lazy
+        expect(field).to_not be_lazy
       end
     end
   end
@@ -491,14 +491,15 @@ describe Mongoid::Fields::ForeignKey do
             type: Array,
             default: [],
             identity: true,
-            metadata: metadata
+            metadata: metadata,
+            overwrite: true
           )
         end
 
         context "when provided nil" do
 
           it "returns an empty array" do
-            field.mongoize(nil).should be_empty
+            expect(field.mongoize(nil)).to be_empty
           end
         end
 
@@ -509,29 +510,29 @@ describe Mongoid::Fields::ForeignKey do
           end
 
           it "returns an empty array" do
-            field.mongoize(array).should eq(array)
+            expect(field.mongoize(array)).to eq(array)
           end
 
           it "returns the same instance" do
-            field.mongoize(array).should equal(array)
+            expect(field.mongoize(array)).to equal(array)
           end
         end
 
         context "when using object ids" do
 
           let(:object_id) do
-            Moped::BSON::ObjectId.new
+            BSON::ObjectId.new
           end
 
           it "performs conversion on the ids if strings" do
-            field.mongoize([object_id.to_s]).should eq([object_id])
+            expect(field.mongoize([object_id.to_s])).to eq([object_id])
           end
         end
 
         context "when not using object ids" do
 
           let(:object_id) do
-            Moped::BSON::ObjectId.new
+            BSON::ObjectId.new
           end
 
           before do
@@ -539,21 +540,23 @@ describe Mongoid::Fields::ForeignKey do
               :_id,
               type: String,
               pre_processed: true,
-              default: ->{ Moped::BSON::ObjectId.new.to_s }
+              default: ->{ BSON::ObjectId.new.to_s },
+              overwrite: true
             )
           end
 
           after do
             Person.field(
               :_id,
-              type: Moped::BSON::ObjectId,
+              type: BSON::ObjectId,
               pre_processed: true,
-              default: ->{ Moped::BSON::ObjectId.new }
+              default: ->{ BSON::ObjectId.new },
+              overwrite: true
             )
           end
 
           it "does not convert" do
-            field.mongoize([object_id.to_s]).should eq([object_id.to_s])
+            expect(field.mongoize([object_id.to_s])).to eq([object_id.to_s])
           end
         end
       end
@@ -577,18 +580,19 @@ describe Mongoid::Fields::ForeignKey do
             type: Object,
             default: nil,
             identity: true,
-            metadata: metadata
+            metadata: metadata,
+            overwrite: true
           )
         end
 
         context "when using object ids" do
 
           let(:object_id) do
-            Moped::BSON::ObjectId.new
+            BSON::ObjectId.new
           end
 
           it "performs conversion on the ids if strings" do
-            field.mongoize(object_id.to_s).should eq(object_id)
+            expect(field.mongoize(object_id.to_s)).to eq(object_id)
           end
         end
 
@@ -599,7 +603,7 @@ describe Mongoid::Fields::ForeignKey do
             context "when provided a string" do
 
               let(:object_id) do
-                Moped::BSON::ObjectId.new
+                BSON::ObjectId.new
               end
 
               before do
@@ -607,21 +611,23 @@ describe Mongoid::Fields::ForeignKey do
                   :_id,
                   type: String,
                   pre_processed: true,
-                  default: ->{ Moped::BSON::ObjectId.new.to_s }
+                  default: ->{ BSON::ObjectId.new.to_s },
+                  overwrite: true
                 )
               end
 
               after do
                 Person.field(
                   :_id,
-                  type: Moped::BSON::ObjectId,
+                  type: BSON::ObjectId,
                   pre_processed: true,
-                  default: ->{ Moped::BSON::ObjectId.new }
+                  default: ->{ BSON::ObjectId.new },
+                  overwrite: true
                 )
               end
 
               it "does not convert" do
-                field.mongoize(object_id.to_s).should eq(object_id.to_s)
+                expect(field.mongoize(object_id.to_s)).to eq(object_id.to_s)
               end
             end
           end
@@ -631,20 +637,21 @@ describe Mongoid::Fields::ForeignKey do
             context "when provided a string" do
 
               before do
-                Person.field(:_id, type: Integer)
+                Person.field(:_id, type: Integer, overwrite: true)
               end
 
               after do
                 Person.field(
                   :_id,
-                  type: Moped::BSON::ObjectId,
+                  type: BSON::ObjectId,
                   pre_processed: true,
-                  default: ->{ Moped::BSON::ObjectId.new }
+                  default: ->{ BSON::ObjectId.new },
+                  overwrite: true
                 )
               end
 
               it "converts the string to an integer" do
-                field.mongoize("1").should eq(1)
+                expect(field.mongoize("1")).to eq(1)
               end
             end
           end
@@ -662,7 +669,7 @@ describe Mongoid::Fields::ForeignKey do
       end
 
       it "returns true" do
-        field.should be_resizable
+        expect(field).to be_resizable
       end
     end
 
@@ -673,7 +680,7 @@ describe Mongoid::Fields::ForeignKey do
       end
 
       it "returns false" do
-        field.should_not be_resizable
+        expect(field).to_not be_resizable
       end
     end
   end
@@ -687,7 +694,7 @@ describe Mongoid::Fields::ForeignKey do
       end
 
       it "casts the ids on the initial set" do
-        agent.account_ids.should eq([ "true", "false", "1", "2" ])
+        expect(agent.account_ids).to eq([ "true", "false", "1", "2" ])
       end
     end
   end