mongoid 3.1.6 → 4.0.2

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

data/spec/mongoid/{validations → validatable}/associated_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Validations::AssociatedValidator do
+describe Mongoid::Validatable::AssociatedValidator do
 
   describe "#valid?" do
 
@@ -21,11 +21,11 @@ describe Mongoid::Validations::AssociatedValidator do
         end
 
         it "only validates the parent once" do
-          user.should be_valid
+          expect(user).to be_valid
         end
 
         it "only validates the child once" do
-          description.should be_valid
+          expect(description).to be_valid
         end
       end
 
@@ -44,18 +44,41 @@ describe Mongoid::Validations::AssociatedValidator do
         end
 
         it "only validates the parent once" do
-          user.should_not be_valid
+          expect(user).to_not be_valid
         end
 
         it "adds the errors from the relation" do
           user.valid?
-          user.errors[:descriptions].should_not be_nil
+          expect(user.errors[:descriptions]).to_not be_nil
         end
 
         it "only validates the child once" do
-          description.should_not be_valid
+          expect(description).to_not be_valid
         end
       end
+
+      context "when the documents are flagged for destroy" do
+
+        let(:user) do
+          User.new(name: "test")
+        end
+
+        let(:description) do
+          Description.new
+        end
+
+        before do
+          description.flagged_for_destroy = true
+          user.descriptions << description
+        end
+
+        it "does not run validation on them" do
+          expect(description).to receive(:valid?).never
+          expect(user).to be_valid
+        end
+
+      end
+
     end
   end
 
@@ -78,43 +101,43 @@ describe Mongoid::Validations::AssociatedValidator do
         end
 
         it "adds no errors" do
-          person.errors[:name].should be_empty
+          expect(person.errors[:name]).to be_empty
         end
       end
 
       context "when the association is valid" do
 
         let(:associated) do
-          stub(valid?: true)
+          double(valid?: true, flagged_for_destroy?: false)
         end
 
         before do
-          associated.should_receive(:validated?).and_return(false)
+          expect(associated).to receive(:validated?).and_return(false)
           validator.validate_each(person, :name, associated)
         end
 
         it "adds no errors" do
-          person.errors[:name].should be_empty
+          expect(person.errors[:name]).to be_empty
         end
       end
 
       context "when the association is invalid" do
 
         let(:associated) do
-          stub(valid?: false)
+          double(valid?: false, flagged_for_destroy?: false)
         end
 
         before do
-          associated.should_receive(:validated?).and_return(false)
+          expect(associated).to receive(:validated?).and_return(false)
           validator.validate_each(person, :name, associated)
         end
 
         it "adds errors to the parent document" do
-          person.errors[:name].should_not be_empty
+          expect(person.errors[:name]).to_not be_empty
         end
 
         it "translates the error in english" do
-          person.errors[:name][0].should eq("is invalid")
+          expect(person.errors[:name][0]).to eq("is invalid")
         end
       end
     end
@@ -128,39 +151,39 @@ describe Mongoid::Validations::AssociatedValidator do
         end
 
         it "adds no errors" do
-          person.errors[:addresses].should be_empty
+          expect(person.errors[:addresses]).to be_empty
         end
       end
 
       context "when the association has invalid documents" do
 
         let(:associated) do
-          stub(valid?: false)
+          double(valid?: false, flagged_for_destroy?: false)
         end
 
         before do
-          associated.should_receive(:validated?).and_return(false)
+          expect(associated).to receive(:validated?).and_return(false)
           validator.validate_each(person, :addresses, [ associated ])
         end
 
         it "adds errors to the parent document" do
-          person.errors[:addresses].should_not be_empty
+          expect(person.errors[:addresses]).to_not be_empty
         end
       end
 
       context "when the assocation has all valid documents" do
 
         let(:associated) do
-          stub(valid?: true)
+          double(valid?: true, flagged_for_destroy?: false)
         end
 
         before do
-          associated.should_receive(:validated?).and_return(false)
+          expect(associated).to receive(:validated?).and_return(false)
           validator.validate_each(person, :addresses, [ associated ])
         end
 
         it "adds no errors" do
-          person.errors[:addresses].should be_empty
+          expect(person.errors[:addresses]).to be_empty
         end
       end
     end
@@ -177,7 +200,7 @@ describe Mongoid::Validations::AssociatedValidator do
     end
 
     it "adds the validation only to the instance" do
-      validators.should eq([ described_class ])
+      expect(validators).to eq([ described_class ])
     end
   end
 end