mongoid 3.1.7 → 4.0.0.alpha1

data/spec/mongoid/atomic/paths/embedded/one_spec.rb

@@ -21,21 +21,21 @@ describe Mongoid::Atomic::Paths::Embedded::One do
   describe "#delete_modifier" do
 
     it "returns $unset" do
-      one.delete_modifier.should eq("$unset")
+      expect(one.delete_modifier).to eq("$unset")
     end
   end
 
   describe "#document" do
 
     it "returns the document" do
-      one.document.should eq(name)
+      expect(one.document).to eq(name)
     end
   end
 
   describe "#insert_modifier" do
 
     it "returns $set" do
-      one.insert_modifier.should eq("$set")
+      expect(one.insert_modifier).to eq("$set")
     end
   end
 
@@ -44,7 +44,7 @@ describe Mongoid::Atomic::Paths::Embedded::One do
     context "when the document is embedded one level" do
 
       it "returns the name of the relation" do
-        one.path.should eq("name")
+        expect(one.path).to eq("name")
       end
     end
 
@@ -68,7 +68,7 @@ describe Mongoid::Atomic::Paths::Embedded::One do
       end
 
       it "returns the nested path to the relation" do
-        one.path.should eq("phone_numbers.country_code")
+        expect(one.path).to eq("phone_numbers.country_code")
       end
     end
   end
@@ -78,7 +78,7 @@ describe Mongoid::Atomic::Paths::Embedded::One do
     context "when the document is embedded one level" do
 
       it "returns the name of the relation" do
-        one.position.should eq("name")
+        expect(one.position).to eq("name")
       end
     end
 
@@ -103,49 +103,7 @@ describe Mongoid::Atomic::Paths::Embedded::One do
       end
 
       it "returns the nested position to the relation" do
-        one.position.should eq("phone_numbers.0.country_code")
-      end
-    end
-  end
-
-  describe "#selector" do
-
-    context "when the document is embedded one level" do
-
-      it "returns the the hash with parent selector" do
-        one.selector.should eq({ "_id" => person._id, "name._id" => name._id })
-      end
-    end
-
-    context "when the document is embedded multiple levels" do
-
-      let(:phone) do
-        Phone.new(number: "404-555-1212")
-      end
-
-      let(:country_code) do
-        CountryCode.new(code: 1)
-      end
-
-      before do
-        phone.country_code = country_code
-        person.phone_numbers << phone
-        phone.new_record = false
-        phone.post_persist
-      end
-
-      let(:one) do
-        described_class.new(country_code)
-      end
-
-      it "returns the hash with all parent selectors" do
-        one.selector.should eq(
-          {
-            "_id" => person._id,
-            "phone_numbers._id" => phone._id,
-            "phone_numbers.0.country_code._id" => country_code._id
-          }
-        )
+        expect(one.position).to eq("phone_numbers.0.country_code")
       end
     end
   end

data/spec/mongoid/atomic/paths/root_spec.rb

@@ -13,21 +13,21 @@ describe Mongoid::Atomic::Paths::Root do
   describe "#document" do
 
     it "returns the document" do
-      root.document.should eq(person)
+      expect(root.document).to eq(person)
     end
   end
 
   describe "#path" do
 
     it "returns an empty string" do
-      root.path.should be_empty
+      expect(root.path).to be_empty
     end
   end
 
   describe "#position" do
 
     it "returns an empty string" do
-      root.position.should be_empty
+      expect(root.position).to be_empty
     end
   end
 
@@ -45,62 +45,4 @@ describe Mongoid::Atomic::Paths::Root do
       expect { root.insert_modifier }.to raise_error(Mongoid::Errors::InvalidPath)
     end
   end
-
-  describe "#selector" do
-
-    context "when using a shard key" do
-
-      let(:profile) do
-        Profile.new(name: "google")
-      end
-
-      let(:root) do
-        described_class.new(profile)
-      end
-
-      it "returns the id and shard key in the hash" do
-        root.selector.should eq({ "_id" => profile.id, "name" => profile.name })
-      end
-    end
-
-    context "when not using a shard key" do
-
-      context "when using object ids" do
-
-        it "returns the hash with the id" do
-          root.selector.should eq({ "_id" => person.id })
-        end
-      end
-
-      context "when using a composite key" do
-
-        let(:account) do
-          Account.new(name: "savings")
-        end
-
-        let(:root) do
-          described_class.new(account)
-        end
-
-        context "when the composite key has changed" do
-
-          before do
-            account.new_record = false
-            account.name = "current"
-          end
-
-          it "returns the hash with the old key" do
-            root.selector.should eq({ "_id" => "savings" })
-          end
-        end
-
-        context "when the composite key has not changed" do
-
-          it "returns the hash with the key" do
-            root.selector.should eq({ "_id" => "savings" })
-          end
-        end
-      end
-    end
-  end
 end

data/spec/mongoid/atomic/paths_spec.rb

@@ -28,14 +28,14 @@ describe Mongoid::Atomic::Paths do
     context "when document is an embeds_one" do
 
       it "returns $unset" do
-        name.atomic_delete_modifier.should eq("$unset")
+        expect(name.atomic_delete_modifier).to eq("$unset")
       end
     end
 
     context "when document is an embeds_many" do
 
       it "returns $pull" do
-        address.atomic_delete_modifier.should eq("$pull")
+        expect(address.atomic_delete_modifier).to eq("$pull")
       end
     end
   end
@@ -50,14 +50,14 @@ describe Mongoid::Atomic::Paths do
     context "when document is an embeds_one" do
 
       it "returns $set" do
-        name.atomic_insert_modifier.should eq("$set")
+        expect(name.atomic_insert_modifier).to eq("$set")
       end
     end
 
     context "when document is an embeds_many" do
 
       it "returns $push" do
-        address.atomic_insert_modifier.should eq("$push")
+        expect(address.atomic_insert_modifier).to eq("$push")
       end
     end
   end
@@ -67,7 +67,7 @@ describe Mongoid::Atomic::Paths do
     context "when the document is a parent" do
 
       it "returns an empty string" do
-        person.atomic_path.should be_empty
+        expect(person.atomic_path).to be_empty
       end
     end
 
@@ -78,7 +78,7 @@ describe Mongoid::Atomic::Paths do
       end
 
       it "returns the inverse_of value of the association" do
-        address.atomic_path.should eq("addresses")
+        expect(address.atomic_path).to eq("addresses")
       end
     end
 
@@ -90,7 +90,7 @@ describe Mongoid::Atomic::Paths do
       end
 
       it "returns the JSON notation to the document" do
-        location.atomic_path.should eq("addresses.locations")
+        expect(location.atomic_path).to eq("addresses.locations")
       end
     end
   end
@@ -100,7 +100,7 @@ describe Mongoid::Atomic::Paths do
     context "when the document is a parent" do
 
       it "returns an id.atomic_selector" do
-        person.atomic_selector.should eq({ "_id" => person.id })
+        expect(person.atomic_selector).to eq({ "_id" => person.id })
       end
     end
 
@@ -111,7 +111,7 @@ describe Mongoid::Atomic::Paths do
       end
 
       it "returns the association with id.atomic_selector" do
-        address.atomic_selector.should eq(
+        expect(address.atomic_selector).to eq(
           { "_id" => person.id, "addresses._id" => address.id }
         )
       end
@@ -125,7 +125,7 @@ describe Mongoid::Atomic::Paths do
       end
 
       it "returns the JSON notation to the document with ids" do
-        location.atomic_selector.should eq(
+        expect(location.atomic_selector).to eq(
           {
             "_id" => person.id,
             "addresses._id" => address.id,
@@ -141,7 +141,7 @@ describe Mongoid::Atomic::Paths do
     context "when the document is a parent" do
 
       it "returns an empty string" do
-        person.atomic_position.should be_empty
+        expect(person.atomic_position).to be_empty
       end
     end
 
@@ -154,7 +154,7 @@ describe Mongoid::Atomic::Paths do
       context "when the document is new" do
 
         it "returns the.atomic_path without index" do
-          address.atomic_position.should eq("addresses")
+          expect(address.atomic_position).to eq("addresses")
         end
       end
 
@@ -165,7 +165,7 @@ describe Mongoid::Atomic::Paths do
         end
 
         it "returns the.atomic_path plus index" do
-          address.atomic_position.should eq("addresses.0")
+          expect(address.atomic_position).to eq("addresses.0")
         end
       end
     end
@@ -185,7 +185,7 @@ describe Mongoid::Atomic::Paths do
       context "when the document is new" do
 
         it "returns the.atomic_path with parent indexes" do
-          location.atomic_position.should eq("addresses.0.locations")
+          expect(location.atomic_position).to eq("addresses.0.locations")
         end
       end
 
@@ -196,7 +196,7 @@ describe Mongoid::Atomic::Paths do
         end
 
         it "returns the.atomic_path plus index" do
-          location.atomic_position.should eq("addresses.0.locations.1")
+          expect(location.atomic_position).to eq("addresses.0.locations.1")
         end
       end
     end
@@ -207,7 +207,7 @@ describe Mongoid::Atomic::Paths do
     context "when the document is a parent" do
 
       it "returns an empty string" do
-        person.atomic_path.should be_empty
+        expect(person.atomic_path).to be_empty
       end
     end
 
@@ -224,7 +224,7 @@ describe Mongoid::Atomic::Paths do
         end
 
         it "returns the.atomic_path without the index" do
-          address.atomic_path.should eq("addresses")
+          expect(address.atomic_path).to eq("addresses")
         end
 
         context "and there are 10 or more documents" do
@@ -236,7 +236,7 @@ describe Mongoid::Atomic::Paths do
           end
 
           it "returns the.atomic_path without the index" do
-            address.atomic_path.should eq("addresses")
+            expect(address.atomic_path).to eq("addresses")
           end
         end
       end
@@ -261,7 +261,7 @@ describe Mongoid::Atomic::Paths do
         end
 
         it "returns the.atomic_path plus index" do
-          location.atomic_path.should eq("addresses.0.locations")
+          expect(location.atomic_path).to eq("addresses.0.locations")
         end
 
       end

data/spec/mongoid/atomic_spec.rb

@@ -21,11 +21,11 @@ describe Mongoid::Atomic do
     end
 
     it "adds the document to the delayed atomic pulls" do
-      person.delayed_atomic_pulls["addresses"].should eq([ address ])
+      expect(person.delayed_atomic_pulls["addresses"]).to eq([ address ])
     end
 
     it "flags the document for destruction" do
-      address.should be_flagged_for_destroy
+      expect(address).to be_flagged_for_destroy
     end
   end
 
@@ -44,11 +44,11 @@ describe Mongoid::Atomic do
     end
 
     it "adds the document to the delayed atomic unsets" do
-      person.delayed_atomic_unsets["name"].should eq([ name ])
+      expect(person.delayed_atomic_unsets["name"]).to eq([ name ])
     end
 
     it "flags the document for destruction" do
-      name.should be_flagged_for_destroy
+      expect(name).to be_flagged_for_destroy
     end
   end
 
@@ -67,7 +67,7 @@ describe Mongoid::Atomic do
         end
 
         it "returns the atomic updates" do
-          person.atomic_updates.should eq({ "$set" => { "title" => "Sir" }})
+          expect(person.atomic_updates).to eq({ "$set" => { "title" => "Sir" }})
         end
 
         context "when an embeds many child is added" do
@@ -77,7 +77,7 @@ describe Mongoid::Atomic do
           end
 
           it "returns a $set and $pushAll for modifications" do
-            person.atomic_updates.should eq(
+            expect(person.atomic_updates).to eq(
               {
                 "$set" => { "title" => "Sir" },
                 "$pushAll" => { "addresses" => [
@@ -95,7 +95,7 @@ describe Mongoid::Atomic do
           end
 
           it "returns a $set for modifications" do
-            person.atomic_updates.should eq(
+            expect(person.atomic_updates).to eq(
               {
                 "$set" => {
                   "title" => "Sir",
@@ -119,7 +119,7 @@ describe Mongoid::Atomic do
           context "when asking for the updates from the root" do
 
             it "returns the $set with correct position and modifications" do
-              person.atomic_updates.should eq(
+              expect(person.atomic_updates).to eq(
                 { "$set" => { "title" => "Sir", "addresses.0.street" => "Bond St" }}
               )
             end
@@ -128,7 +128,7 @@ describe Mongoid::Atomic do
           context "when asking for the updates from the child" do
 
             it "returns the $set with correct position and modifications" do
-              address.atomic_updates.should eq(
+              expect(address.atomic_updates).to eq(
                 { "$set" => { "addresses.0.street" => "Bond St" }}
               )
             end
@@ -147,7 +147,7 @@ describe Mongoid::Atomic do
             context "when asking for the updates from the root" do
 
               it "returns the $set with correct positions and modifications" do
-                person.atomic_updates.should eq(
+                expect(person.atomic_updates).to eq(
                   { "$set" => {
                     "title" => "Sir",
                     "addresses.0.street" => "Bond St",
@@ -160,7 +160,7 @@ describe Mongoid::Atomic do
             context "when asking for the updates from the 1st level child" do
 
               it "returns the $set with correct positions and modifications" do
-                address.atomic_updates.should eq(
+                expect(address.atomic_updates).to eq(
                   { "$set" => {
                     "addresses.0.street" => "Bond St",
                     "addresses.0.locations.0.name" => "Work" }
@@ -172,7 +172,7 @@ describe Mongoid::Atomic do
             context "when asking for the updates from the 2nd level child" do
 
               it "returns the $set with correct positions and modifications" do
-                location.atomic_updates.should eq(
+                expect(location.atomic_updates).to eq(
                   { "$set" => {
                     "addresses.0.locations.0.name" => "Work" }
                   }
@@ -190,7 +190,7 @@ describe Mongoid::Atomic do
             context "when asking for the updates from the root" do
 
               it "returns the $set with correct positions and modifications" do
-                person.atomic_updates.should eq(
+                expect(person.atomic_updates).to eq(
                   {
                     "$set" => {
                       "title" => "Sir",
@@ -209,7 +209,7 @@ describe Mongoid::Atomic do
             context "when asking for the updates from the 1st level child" do
 
               it "returns the $set with correct positions and modifications" do
-                address.atomic_updates.should eq(
+                expect(address.atomic_updates).to eq(
                   {
                     "$set" => {
                       "addresses.0.street" => "Bond St"
@@ -236,7 +236,7 @@ describe Mongoid::Atomic do
             end
 
             it "returns the $set for the first level and $unset for other." do
-              updates.should eq({
+              expect(updates).to eq({
                 "$unset" => { "addresses" => true },
                 "$set" => { "title" => "Sir" }
               })
@@ -256,7 +256,7 @@ describe Mongoid::Atomic do
             context "when asking for the updates from the root document" do
 
               it "returns the $set for 1st level and other for the 2nd level" do
-                person.atomic_updates.should eq(
+                expect(person.atomic_updates).to eq(
                   {
                     "$set" => {
                       "title" => "Sir",
@@ -282,7 +282,7 @@ describe Mongoid::Atomic do
             context "when asking for the updates from the 1st level document" do
 
               it "returns the $set for 1st level and other for the 2nd level" do
-                address.atomic_updates.should eq(
+                expect(address.atomic_updates).to eq(
                   { "$set" => { "addresses.0.street" => "Bond St" }}
                 )
               end
@@ -305,7 +305,7 @@ describe Mongoid::Atomic do
             end
 
             it "returns the $set for 1st and 2nd level and other for the 3nd level" do
-              person.atomic_updates.should eq(
+              expect(person.atomic_updates).to eq(
                 {
                   "$set" => {
                     "title" => "Sir"
@@ -340,7 +340,7 @@ describe Mongoid::Atomic do
           end
 
           it "returns the proper $sets and $pushAlls for all levels" do
-            person.atomic_updates.should eq(
+            expect(person.atomic_updates).to eq(
               {
                 "$set" => {
                   "title" => "Sir",