mongoid 3.1.7 → 4.0.2

data/spec/mongoid/threaded_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Mongoid::Threaded do
 
   let(:object) do
-    stub
+    double
   end
 
   describe "#begin" do
@@ -17,7 +17,7 @@ describe Mongoid::Threaded do
     end
 
     it "adds a boolen to the load stack" do
-      described_class.stack("load").should eq([ true ])
+      expect(described_class.stack("load")).to eq([ true ])
     end
   end
 
@@ -26,7 +26,7 @@ describe Mongoid::Threaded do
     context "when loading is not set" do
 
       it "returns false" do
-        described_class.should_not be_executing(:load)
+        expect(described_class).to_not be_executing(:load)
       end
     end
 
@@ -41,7 +41,7 @@ describe Mongoid::Threaded do
       end
 
       it "returns true" do
-        described_class.should be_executing(:load)
+        expect(described_class).to be_executing(:load)
       end
     end
 
@@ -52,7 +52,7 @@ describe Mongoid::Threaded do
       end
 
       it "returns false" do
-        described_class.should_not be_executing(:load)
+        expect(described_class).to_not be_executing(:load)
       end
     end
   end
@@ -66,7 +66,7 @@ describe Mongoid::Threaded do
       end
 
       it "returns an empty stack" do
-        loading.should be_empty
+        expect(loading).to be_empty
       end
     end
 
@@ -85,7 +85,7 @@ describe Mongoid::Threaded do
       end
 
       it "returns the stack" do
-        loading.should eq([ true ])
+        expect(loading).to eq([ true ])
       end
     end
   end
@@ -102,67 +102,14 @@ describe Mongoid::Threaded do
     end
 
     it "removes a boolen from the stack" do
-      described_class.stack("load").should be_empty
-    end
-  end
-
-  describe "#clear_persistence_options" do
-
-    before do
-      described_class.set_persistence_options(Band, { safe: { w: 3 }})
-    end
-
-    let!(:cleared) do
-      described_class.clear_persistence_options(Band)
-    end
-
-    it "removes all persistence options" do
-      described_class.persistence_options(Band).should be_nil
-    end
-
-    it "returns true" do
-      cleared.should be_true
-    end
-  end
-
-  describe "#identity_map" do
-
-    before do
-      Thread.current["[mongoid]:identity-map"] = object
-    end
-
-    after do
-      Thread.current["[mongoid]:identity-map"] = nil
-    end
-
-    it "returns the object with the identity map key" do
-      described_class.identity_map.should eq(object)
-    end
-  end
-
-  describe "#persistence_options" do
-
-    before do
-      described_class.set_persistence_options(Band, { safe: { w: 3 }})
-    end
-
-    after do
-      described_class.set_persistence_options(Band, nil)
-    end
-
-    let(:options) do
-      described_class.persistence_options(Band)
-    end
-
-    it "sets the persistence options" do
-      options.should eq({ safe: { w: 3 }})
+      expect(described_class.stack("load")).to be_empty
     end
   end
 
   describe "#scope_stack" do
 
     it "returns the default with the scope stack key" do
-      described_class.scope_stack.should be_a(Hash)
+      expect(described_class.scope_stack).to be_a(Hash)
     end
   end
 
@@ -181,7 +128,7 @@ describe Mongoid::Threaded do
     end
 
     it "marks the document as being validated" do
-      described_class.validations_for(Person).should eq([ person.id ])
+      expect(described_class.validations_for(Person)).to eq([ person.id ])
     end
   end
 
@@ -197,7 +144,7 @@ describe Mongoid::Threaded do
     end
 
     it "unmarks the document as being validated" do
-      described_class.validations_for(Person).should be_empty
+      expect(described_class.validations_for(Person)).to be_empty
     end
   end
 
@@ -218,14 +165,14 @@ describe Mongoid::Threaded do
       end
 
       it "returns true" do
-        described_class.validated?(person).should be_true
+        expect(described_class.validated?(person)).to be true
       end
     end
 
     context "when the document is not validated" do
 
       it "returns false" do
-        described_class.validated?(person).should be_false
+        expect(described_class.validated?(person)).to be false
       end
     end
   end
@@ -245,7 +192,7 @@ describe Mongoid::Threaded do
     end
 
     it "marks the document as being autosaved" do
-      described_class.autosaves_for(Person).should eq([ person.id ])
+      expect(described_class.autosaves_for(Person)).to eq([ person.id ])
     end
   end
 
@@ -261,7 +208,7 @@ describe Mongoid::Threaded do
     end
 
     it "unmarks the document as being autosaved" do
-      described_class.autosaves_for(Person).should be_empty
+      expect(described_class.autosaves_for(Person)).to be_empty
     end
   end
 
@@ -282,14 +229,14 @@ describe Mongoid::Threaded do
       end
 
       it "returns true" do
-        described_class.autosaved?(person).should be_true
+        expect(described_class.autosaved?(person)).to be true
       end
     end
 
     context "when the document is not autosaved" do
 
       it "returns false" do
-        described_class.autosaved?(person).should be_false
+        expect(described_class.autosaved?(person)).to be false
       end
     end
   end

data/spec/mongoid/timestamps/created/short_spec.rb

@@ -18,19 +18,19 @@ describe Mongoid::Timestamps::Created::Short do
     end
 
     it "adds c_at to the document" do
-      fields["c_at"].should_not be_nil
+      expect(fields["c_at"]).to_not be_nil
     end
 
     it "does not add u_at to the document" do
-      fields["u_at"].should be_nil
+      expect(fields["u_at"]).to be_nil
     end
 
     it "does not add the created_at to the document" do
-      fields["created_at"].should be_nil
+      expect(fields["created_at"]).to be_nil
     end
 
     it "forces the c_at timestamps to UTC" do
-      quiz.created_at.should be_within(10).of(Time.now.utc)
+      expect(quiz.created_at).to be_within(10).of(Time.now.utc)
     end
   end
 
@@ -41,11 +41,11 @@ describe Mongoid::Timestamps::Created::Short do
     end
 
     it "runs the created callbacks" do
-      quiz.created_at.should be_within(10).of(Time.now.utc)
+      expect(quiz.created_at).to be_within(10).of(Time.now.utc)
     end
 
     it "allows access via the raw field" do
-      quiz.c_at.should eq(quiz.created_at)
+      expect(quiz.c_at).to eq(quiz.created_at)
     end
   end
 end

data/spec/mongoid/timestamps/created_spec.rb

@@ -18,15 +18,15 @@ describe Mongoid::Timestamps::Created do
     end
 
     it "adds created_at to the document" do
-      fields["created_at"].should_not be_nil
+      expect(fields["created_at"]).to_not be_nil
     end
 
     it "does not add updated_at to the document" do
-      fields["updated_at"].should be_nil
+      expect(fields["updated_at"]).to be_nil
     end
 
     it "forces the created_at timestamps to UTC" do
-      quiz.created_at.should be_within(10).of(Time.now.utc)
+      expect(quiz.created_at).to be_within(10).of(Time.now.utc)
     end
   end
 
@@ -37,8 +37,8 @@ describe Mongoid::Timestamps::Created do
     end
 
     it "runs the created callbacks" do
-      quiz.created_at.should_not be_nil
-      quiz.created_at.should be_within(10).of(Time.now.utc)
+      expect(quiz.created_at).to_not be_nil
+      expect(quiz.created_at).to be_within(10).of(Time.now.utc)
     end
   end
 end

data/spec/mongoid/timestamps/timeless_spec.rb

@@ -73,11 +73,11 @@ describe Mongoid::Timestamps::Timeless do
         end
 
         it "does not set the created timestamp" do
-          document.created_at.should be_nil
+          expect(document.created_at).to be_nil
         end
 
         it "does not set the updated timestamp" do
-          document.updated_at.should be_nil
+          expect(document.updated_at).to be_nil
         end
 
         it "clears out the timeless option after save" do
@@ -91,7 +91,7 @@ describe Mongoid::Timestamps::Timeless do
           end
 
           it "sets the updated timestamp" do
-            document.updated_at.should_not be_nil
+            expect(document.updated_at).to_not be_nil
           end
         end
       end
@@ -103,11 +103,11 @@ describe Mongoid::Timestamps::Timeless do
         end
 
         it "does not set the created timestamp" do
-          document.created_at.should be_nil
+          expect(document.created_at).to be_nil
         end
 
         it "does not set the updated timestamp" do
-          document.updated_at.should be_nil
+          expect(document.updated_at).to be_nil
         end
 
         it "clears out the timeless option after save" do
@@ -121,7 +121,7 @@ describe Mongoid::Timestamps::Timeless do
           end
 
           it "sets the updated timestamp" do
-            document.updated_at.should_not be_nil
+            expect(document.updated_at).to_not be_nil
           end
         end
       end

data/spec/mongoid/timestamps/updated/short_spec.rb

@@ -18,23 +18,23 @@ describe Mongoid::Timestamps::Updated::Short do
     end
 
     it "does not add c_at to the document" do
-      fields["c_at"].should be_nil
+      expect(fields["c_at"]).to be_nil
     end
 
     it "adds u_at to the document" do
-      fields["u_at"].should_not be_nil
+      expect(fields["u_at"]).to_not be_nil
     end
 
     it "does not add the long updated_at" do
-      fields["updated_at"].should be_nil
+      expect(fields["updated_at"]).to be_nil
     end
 
     it "forces the updated_at timestamps to UTC" do
-      agent.updated_at.should be_within(10).of(Time.now.utc)
+      expect(agent.updated_at).to be_within(10).of(Time.now.utc)
     end
 
     it "aliases the raw field" do
-      agent.u_at.should eq(agent.updated_at)
+      expect(agent.u_at).to eq(agent.updated_at)
     end
   end
 
@@ -51,11 +51,11 @@ describe Mongoid::Timestamps::Updated::Short do
       end
 
       it "does not override it with the default" do
-        doc.updated_at.should eq(time)
+        expect(doc.updated_at).to eq(time)
       end
 
       it "does not persist an auto value" do
-        doc.reload.updated_at.should eq(time)
+        expect(doc.reload.updated_at).to eq(time)
       end
     end
   end
@@ -63,7 +63,7 @@ describe Mongoid::Timestamps::Updated::Short do
   context "when the document has not changed" do
 
     let(:agent) do
-      ShortAgent.instantiate("_id" => Moped::BSON::ObjectId.new, "account_ids" => [])
+      ShortAgent.instantiate("_id" => BSON::ObjectId.new, "account_ids" => [])
     end
 
     before do
@@ -71,7 +71,7 @@ describe Mongoid::Timestamps::Updated::Short do
     end
 
     it "does not run the update callbacks" do
-      agent.should_receive(:updated_at=).never
+      expect(agent).to receive(:updated_at=).never
       agent.save
     end
   end
@@ -83,8 +83,8 @@ describe Mongoid::Timestamps::Updated::Short do
     end
 
     it "runs the update callbacks" do
-      agent.updated_at.should_not be_nil
-      agent.updated_at.should be_within(10).of(Time.now.utc)
+      expect(agent.updated_at).to_not be_nil
+      expect(agent.updated_at).to be_within(10).of(Time.now.utc)
     end
   end
 end

data/spec/mongoid/timestamps/updated_spec.rb

@@ -18,19 +18,15 @@ describe Mongoid::Timestamps::Updated do
     end
 
     it "does not add created_at to the document" do
-      fields["created_at"].should be_nil
+      expect(fields["created_at"]).to be_nil
     end
 
     it "adds updated_at to the document" do
-      fields["updated_at"].should_not be_nil
+      expect(fields["updated_at"]).to_not be_nil
     end
 
     it "forces the updated_at timestamps to UTC" do
-      agent.updated_at.should be_within(10).of(Time.now.utc)
-    end
-
-    it "includes a record_timestamps class_accessor to ease AR compatibility" do
-      Agent.should.respond_to? :record_timestamps
+      expect(agent.updated_at).to be_within(10).of(Time.now.utc)
     end
   end
 
@@ -47,11 +43,11 @@ describe Mongoid::Timestamps::Updated do
       end
 
       it "does not override it with the default" do
-        doc.updated_at.should eq(time)
+        expect(doc.updated_at).to eq(time)
       end
 
       it "does not persist an auto value" do
-        doc.reload.updated_at.should eq(time)
+        expect(doc.reload.updated_at).to eq(time)
       end
     end
   end
@@ -59,7 +55,7 @@ describe Mongoid::Timestamps::Updated do
   context "when the document has not changed" do
 
     let(:agent) do
-      Agent.instantiate("_id" => Moped::BSON::ObjectId.new, "account_ids" => [])
+      Agent.instantiate("_id" => BSON::ObjectId.new, "account_ids" => [])
     end
 
     before do
@@ -67,7 +63,7 @@ describe Mongoid::Timestamps::Updated do
     end
 
     it "does not run the update callbacks" do
-      agent.should_receive(:updated_at=).never
+      expect(agent).to receive(:updated_at=).never
       agent.save
     end
   end
@@ -79,8 +75,8 @@ describe Mongoid::Timestamps::Updated do
     end
 
     it "runs the update callbacks" do
-      agent.updated_at.should_not be_nil
-      agent.updated_at.should be_within(10).of(Time.now.utc)
+      expect(agent.updated_at).to_not be_nil
+      expect(agent.updated_at).to be_within(10).of(Time.now.utc)
     end
   end
 end

data/spec/mongoid/timestamps_spec.rb

@@ -18,27 +18,23 @@ describe Mongoid::Timestamps do
     end
 
     it "adds created_at to the document" do
-      fields["created_at"].should_not be_nil
+      expect(fields["created_at"]).to_not be_nil
     end
 
     it "adds updated_at to the document" do
-      fields["updated_at"].should_not be_nil
+      expect(fields["updated_at"]).to_not be_nil
     end
 
     it "forces the created_at timestamps to UTC" do
-      document.created_at.should be_within(10).of(Time.now.utc)
+      expect(document.created_at).to be_within(10).of(Time.now.utc)
     end
 
     it "forces the updated_at timestamps to UTC" do
-      document.updated_at.should be_within(10).of(Time.now.utc)
+      expect(document.updated_at).to be_within(10).of(Time.now.utc)
     end
 
     it "ensures created_at equals updated_at on new records" do
-      document.updated_at.should eq(document.created_at)
-    end
-
-    it "includes a record_timestamps class_accessor to ease AR compatibility" do
-      Dokument.should.respond_to? :record_timestamps
+      expect(document.updated_at).to eq(document.created_at)
     end
   end
 
@@ -53,7 +49,7 @@ describe Mongoid::Timestamps do
     end
 
     it "does not run the update callbacks" do
-      document.should_receive(:updated_at=).never
+      expect(document).to receive(:updated_at=).never
       document.save
     end
   end
@@ -70,7 +66,7 @@ describe Mongoid::Timestamps do
     end
 
     it "does not set updated at" do
-      document.should_receive(:updated_at=).never
+      expect(document).to receive(:updated_at=).never
       document.save
     end
   end
@@ -82,7 +78,7 @@ describe Mongoid::Timestamps do
     end
 
     it "runs the update callbacks" do
-      document.updated_at.should eq(document.created_at)
+      expect(document.updated_at).to eq(document.created_at)
     end
   end
 
@@ -106,7 +102,7 @@ describe Mongoid::Timestamps do
     end
 
     it "updates the root document updated at" do
-      document.updated_at.should be_within(1).of(Time.now)
+      expect(document.updated_at).to be_within(1).of(Time.now)
     end
   end
 end

data/spec/mongoid/{hierarchy_spec.rb → traversable_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Hierarchy do
+describe Mongoid::Traversable do
 
   describe "#_children" do
 
@@ -24,11 +24,11 @@ describe Mongoid::Hierarchy do
       end
 
       it "includes embeds_one documents" do
-        person._children.should include(name)
+        expect(person._children).to include(name)
       end
 
       it "includes embeds_many documents" do
-        person._children.should include(address)
+        expect(person._children).to include(address)
       end
     end
 
@@ -53,15 +53,15 @@ describe Mongoid::Hierarchy do
       end
 
       it "includes embeds_one documents" do
-        person._children.should include(name)
+        expect(person._children).to include(name)
       end
 
       it "includes embeds_many documents" do
-        person._children.should include(address)
+        expect(person._children).to include(address)
       end
 
       it "includes embedded documents multiple levels deep" do
-        person._children.should include(location)
+        expect(person._children).to include(location)
       end
     end
   end
@@ -71,14 +71,14 @@ describe Mongoid::Hierarchy do
     context "when the document is a subclass" do
 
       it "returns true" do
-        Circle.should be_hereditary
+        expect(Circle).to be_hereditary
       end
     end
 
     context "when the document is not a subclass" do
 
       it "returns false" do
-        Shape.should_not be_hereditary
+        expect(Shape).to_not be_hereditary
       end
     end
   end
@@ -88,14 +88,14 @@ describe Mongoid::Hierarchy do
     context "when the document is a subclass" do
 
       it "returns true" do
-        Circle.new.should be_hereditary
+        expect(Circle.new).to be_hereditary
       end
     end
 
     context "when the document is not a subclass" do
 
       it "returns false" do
-        Shape.new.should_not be_hereditary
+        expect(Shape.new).to_not be_hereditary
       end
     end
   end
@@ -122,7 +122,7 @@ describe Mongoid::Hierarchy do
     end
 
     it "sets the parent document" do
-      address._parent.should eq(person)
+      expect(address._parent).to eq(person)
     end
   end
 
@@ -143,7 +143,7 @@ describe Mongoid::Hierarchy do
       end
 
       it "removes the relation instance" do
-        person.name.should be_nil
+        expect(person.name).to be_nil
       end
     end
 
@@ -158,7 +158,7 @@ describe Mongoid::Hierarchy do
       end
 
       it "removes the document from the relation target" do
-        person.addresses.should be_empty
+        expect(person.addresses).to be_empty
       end
     end
   end
@@ -180,14 +180,14 @@ describe Mongoid::Hierarchy do
     context "when the document is not the root" do
 
       it "returns the root" do
-        address._root.should eq(person)
+        expect(address._root).to eq(person)
       end
     end
 
     context "when the document is the root" do
 
       it "returns self" do
-        person._root.should eq(person)
+        expect(person._root).to eq(person)
       end
     end
   end
@@ -203,7 +203,7 @@ describe Mongoid::Hierarchy do
         end
 
         it "returns true" do
-          band.should be__root
+          expect(band).to be__root
         end
       end
 
@@ -216,7 +216,7 @@ describe Mongoid::Hierarchy do
         context "when the document is root in a cyclic relation" do
 
           it "returns true" do
-            root_role.should be__root
+            expect(root_role).to be__root
           end
         end
 
@@ -227,7 +227,7 @@ describe Mongoid::Hierarchy do
           end
 
           it "returns false" do
-            child_role.should_not be__root
+            expect(child_role).to_not be__root
           end
         end
       end
@@ -244,7 +244,7 @@ describe Mongoid::Hierarchy do
       end
 
       it "returns false" do
-        address.should_not be__root
+        expect(address).to_not be__root
       end
     end
   end