mongoid 3.1.6 → 4.0.2

data/spec/mongoid/contextual/atomic_spec.rb

@@ -27,19 +27,19 @@ describe Mongoid::Contextual::Atomic do
       end
 
       before do
-        context.add_to_set(:members, "Dave")
+        context.add_to_set(members: "Dave")
       end
 
       it "does not add duplicates" do
-        depeche_mode.reload.members.should eq([ "Dave" ])
+        expect(depeche_mode.reload.members).to eq([ "Dave" ])
       end
 
       it "adds unique values" do
-        new_order.reload.members.should eq([ "Peter", "Dave" ])
+        expect(new_order.reload.members).to eq([ "Peter", "Dave" ])
       end
 
       it "adds to non initialized fields" do
-        smiths.reload.members.should eq([ "Dave" ])
+        expect(smiths.reload.members).to eq([ "Dave" ])
       end
     end
 
@@ -54,19 +54,23 @@ describe Mongoid::Contextual::Atomic do
       end
 
       before do
-        context.add_to_set(:members, "Dave")
+        context.add_to_set(members: "Dave", genres: "Electro")
       end
 
       it "does not add duplicates" do
-        depeche_mode.reload.members.should eq([ "Dave" ])
+        expect(depeche_mode.reload.members).to eq([ "Dave" ])
+      end
+
+      it "adds multiple operations" do
+        expect(depeche_mode.reload.genres).to eq([ "Electro" ])
       end
 
       it "adds unique values" do
-        new_order.reload.members.should eq([ "Peter", "Dave" ])
+        expect(new_order.reload.members).to eq([ "Peter", "Dave" ])
       end
 
       it "adds to non initialized fields" do
-        smiths.reload.members.should eq([ "Dave" ])
+        expect(smiths.reload.members).to eq([ "Dave" ])
       end
     end
   end
@@ -92,48 +96,48 @@ describe Mongoid::Contextual::Atomic do
     context "when performing a bitwise and" do
 
       before do
-        context.bit(:likes, { and: 13 })
+        context.bit(likes: { and: 13 })
       end
 
       it "performs the bitwise operation on initialized fields" do
-        depeche_mode.reload.likes.should eq(12)
+        expect(depeche_mode.reload.likes).to eq(12)
       end
 
       it "does not error on non initialized fields" do
-        smiths.reload.likes.should be_nil
+        expect(smiths.reload.likes).to eq(0)
       end
     end
 
     context "when performing a bitwise or" do
 
       before do
-        context.bit(:likes, { or: 13 })
+        context.bit(likes: { or: 13 })
       end
 
       it "performs the bitwise operation on initialized fields" do
-        depeche_mode.reload.likes.should eq(61)
+        expect(depeche_mode.reload.likes).to eq(61)
       end
 
       it "does not error on non initialized fields" do
-        smiths.reload.likes.should be_nil
+        expect(smiths.reload.likes).to eq(13)
       end
     end
 
     context "when chaining bitwise operations" do
 
       before do
-        context.bit(:likes, { and: 13, or: 10 })
+        context.bit(likes: { and: 13, or: 10 })
       end
 
       it "performs the bitwise operation on initialized fields" do
-        depeche_mode.reload.likes.should eq(14)
+        expect(depeche_mode.reload.likes).to eq(14)
       end
 
       it "does not error on non initialized fields" do
-        smiths.reload.likes.should be_nil
+        expect(smiths.reload.likes).to eq(10)
       end
     end
-  end
+  end if mongodb_version > "2.5"
 
   describe "#inc" do
 
@@ -158,35 +162,35 @@ describe Mongoid::Contextual::Atomic do
     end
 
     before do
-      context.inc(:likes, 10)
+      context.inc(likes: 10)
     end
 
     context "when the field exists" do
 
       it "incs the value" do
-        depeche_mode.reload.likes.should eq(70)
+        expect(depeche_mode.reload.likes).to eq(70)
       end
     end
 
     context "when the field does not exist" do
 
       it "does not error on the inc" do
-        smiths.likes.should be_nil
+        expect(smiths.likes).to be_nil
       end
     end
 
     context "when using the alias" do
 
       before do
-        context.inc(:years, 1)
+        context.inc(years: 1)
       end
 
       it "incs the value and read from alias" do
-        beatles.reload.years.should eq(3)
+        expect(beatles.reload.years).to eq(3)
       end
 
       it "incs the value and read from field" do
-        beatles.reload.y.should eq(3)
+        expect(beatles.reload.y).to eq(3)
       end
     end
   end
@@ -212,30 +216,30 @@ describe Mongoid::Contextual::Atomic do
     context "when popping from the front" do
 
       before do
-        context.pop(:members, -1)
+        context.pop(members: -1)
       end
 
       it "pops the first element off the array" do
-        depeche_mode.reload.members.should eq([ "Martin" ])
+        expect(depeche_mode.reload.members).to eq([ "Martin" ])
       end
 
       it "does not error on uninitialized fields" do
-        smiths.reload.members.should be_nil
+        expect(smiths.reload.members).to be_nil
       end
     end
 
     context "when popping from the rear" do
 
       before do
-        context.pop(:members, 1)
+        context.pop(members: 1)
       end
 
       it "pops the last element off the array" do
-        depeche_mode.reload.members.should eq([ "Dave" ])
+        expect(depeche_mode.reload.members).to eq([ "Dave" ])
       end
 
       it "does not error on uninitialized fields" do
-        smiths.reload.members.should be_nil
+        expect(smiths.reload.members).to be_nil
       end
     end
   end
@@ -259,15 +263,15 @@ describe Mongoid::Contextual::Atomic do
     end
 
     before do
-      context.pull(:members, "Alan")
+      context.pull(members: "Alan")
     end
 
     it "pulls when the value is found" do
-      depeche_mode.reload.members.should eq([ "Dave" ])
+      expect(depeche_mode.reload.members).to eq([ "Dave" ])
     end
 
     it "does not error on non existant fields" do
-      smiths.reload.members.should be_nil
+      expect(smiths.reload.members).to be_nil
     end
   end
 
@@ -290,15 +294,15 @@ describe Mongoid::Contextual::Atomic do
     end
 
     before do
-      context.pull_all(:members, [ "Alan", "Dave" ])
+      context.pull_all(members: [ "Alan", "Dave" ])
     end
 
     it "pulls when the values are found" do
-      depeche_mode.reload.members.should eq([ "Fletch" ])
+      expect(depeche_mode.reload.members).to eq([ "Fletch" ])
     end
 
     it "does not error on non existant fields" do
-      smiths.reload.members.should be_nil
+      expect(smiths.reload.members).to be_nil
     end
   end
 
@@ -321,15 +325,15 @@ describe Mongoid::Contextual::Atomic do
     end
 
     before do
-      context.push(:members, "Alan")
+      context.push(members: "Alan")
     end
 
     it "pushes the value to existing arrays" do
-      depeche_mode.reload.members.should eq([ "Dave", "Alan" ])
+      expect(depeche_mode.reload.members).to eq([ "Dave", "Alan" ])
     end
 
     it "pushes to non existant fields" do
-      smiths.reload.members.should eq([ "Alan" ])
+      expect(smiths.reload.members).to eq([ "Alan" ])
     end
   end
 
@@ -352,15 +356,15 @@ describe Mongoid::Contextual::Atomic do
     end
 
     before do
-      context.push_all(:members, [ "Alan", "Fletch" ])
+      context.push_all(members: [ "Alan", "Fletch" ])
     end
 
     it "pushes the values to existing arrays" do
-      depeche_mode.reload.members.should eq([ "Dave", "Alan", "Fletch" ])
+      expect(depeche_mode.reload.members).to eq([ "Dave", "Alan", "Fletch" ])
     end
 
     it "pushes to non existant fields" do
-      smiths.reload.members.should eq([ "Alan", "Fletch" ])
+      expect(smiths.reload.members).to eq([ "Alan", "Fletch" ])
     end
   end
 
@@ -383,15 +387,15 @@ describe Mongoid::Contextual::Atomic do
     end
 
     before do
-      context.rename(:members, :artists)
+      context.rename(members: :artists)
     end
 
     it "renames existing fields" do
-      depeche_mode.reload.artists.should eq([ "Dave" ])
+      expect(depeche_mode.reload.artists).to eq([ "Dave" ])
     end
 
     it "does not rename non existant fields" do
-      smiths.reload.should_not respond_to(:artists)
+      expect(smiths.reload).to_not respond_to(:artists)
     end
   end
 
@@ -414,15 +418,15 @@ describe Mongoid::Contextual::Atomic do
     end
 
     before do
-      context.set(:name, "Recoil")
+      context.set(name: "Recoil")
     end
 
     it "sets existing fields" do
-      depeche_mode.reload.name.should eq("Recoil")
+      expect(depeche_mode.reload.name).to eq("Recoil")
     end
 
     it "sets non existant fields" do
-      smiths.reload.name.should eq("Recoil")
+      expect(smiths.reload.name).to eq("Recoil")
     end
   end
 
@@ -453,11 +457,11 @@ describe Mongoid::Contextual::Atomic do
         end
 
         it "unsets the first existing field" do
-          depeche_mode.reload.name.should be_nil
+          expect(depeche_mode.reload.name).to be_nil
         end
 
         it "unsets the last existing field" do
-          new_order.reload.name.should be_nil
+          expect(new_order.reload.name).to be_nil
         end
       end
 
@@ -468,11 +472,11 @@ describe Mongoid::Contextual::Atomic do
         end
 
         it "unsets the first existing field" do
-          depeche_mode.reload.years.should be_nil
+          expect(depeche_mode.reload.years).to be_nil
         end
 
         it "unsets the last existing field" do
-          new_order.reload.years.should be_nil
+          expect(new_order.reload.years).to be_nil
         end
       end
     end
@@ -498,11 +502,11 @@ describe Mongoid::Contextual::Atomic do
         end
 
         it "unsets name field" do
-          new_order.reload.name.should be_nil
+          expect(new_order.reload.name).to be_nil
         end
 
         it "unsets genres field" do
-          new_order.reload.genres.should be_nil
+          expect(new_order.reload.genres).to be_nil
         end
       end
 
@@ -513,11 +517,11 @@ describe Mongoid::Contextual::Atomic do
         end
 
         it "unsets the unaliased field" do
-          new_order.reload.name.should be_nil
+          expect(new_order.reload.name).to be_nil
         end
 
         it "unsets the aliased field" do
-          new_order.reload.years.should be_nil
+          expect(new_order.reload.years).to be_nil
         end
       end
     end

data/spec/mongoid/contextual/find_and_modify_spec.rb

@@ -33,11 +33,11 @@ describe Mongoid::Contextual::FindAndModify do
         end
 
         it "returns the first matching document" do
-          result["name"].should eq("Depeche Mode")
+          expect(result["name"]).to eq("Depeche Mode")
         end
 
         it "updates the document in the database" do
-          depeche.reload.likes.should eq(1)
+          expect(depeche.reload.likes).to eq(1)
         end
       end
 
@@ -60,11 +60,11 @@ describe Mongoid::Contextual::FindAndModify do
         end
 
         it "returns the first matching document" do
-          result["name"].should eq("Depeche Mode")
+          expect(result["name"]).to eq("Depeche Mode")
         end
 
         it "updates the document in the database" do
-          depeche.reload.created.should eq(date_time)
+          expect(depeche.reload.created).to eq(date_time)
         end
       end
 
@@ -83,11 +83,11 @@ describe Mongoid::Contextual::FindAndModify do
         end
 
         it "returns the first matching document" do
-          result["name"].should eq("Tool")
+          expect(result["name"]).to eq("Tool")
         end
 
         it "updates the document in the database" do
-          tool.reload.likes.should eq(1)
+          expect(tool.reload.likes).to eq(1)
         end
       end
 
@@ -106,15 +106,15 @@ describe Mongoid::Contextual::FindAndModify do
         end
 
         it "returns the first matching document" do
-          result["_id"].should eq(depeche.id)
+          expect(result["_id"]).to eq(depeche.id)
         end
 
         it "limits the returned fields" do
-          result["name"].should be_nil
+          expect(result["name"]).to be_nil
         end
 
         it "updates the document in the database" do
-          depeche.reload.likes.should eq(1)
+          expect(depeche.reload.likes).to eq(1)
         end
       end
 
@@ -133,11 +133,11 @@ describe Mongoid::Contextual::FindAndModify do
         end
 
         it "returns the first matching document" do
-          result["name"].should eq("Depeche Mode")
+          expect(result["name"]).to eq("Depeche Mode")
         end
 
         it "returns the updated document" do
-          result["likes"].should eq(1)
+          expect(result["likes"]).to eq(1)
         end
       end
 
@@ -156,7 +156,7 @@ describe Mongoid::Contextual::FindAndModify do
         end
 
         it "returns the first matching document" do
-          result["name"].should eq("Depeche Mode")
+          expect(result["name"]).to eq("Depeche Mode")
         end
 
         it "deletes the document from the database" do
@@ -193,7 +193,7 @@ describe Mongoid::Contextual::FindAndModify do
             result
           }.to_not change{Band.where(name: "The Mars Volta").count}
 
-          the_mars_volta.reload.likes.should eq(1)
+          expect(the_mars_volta.reload.likes).to eq(1)
         end
       end
     end
@@ -213,7 +213,7 @@ describe Mongoid::Contextual::FindAndModify do
       end
 
       it "returns nil" do
-        result.should be_nil
+        expect(result).to be_nil
       end
     end
   end