mongoid 3.1.6 → 4.0.2

data/spec/mongoid/{dirty_spec.rb → changeable_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::Dirty do
+describe Mongoid::Changeable do
 
   describe "#attribute_change" do
 
@@ -17,13 +17,13 @@ describe Mongoid::Dirty do
         end
 
         it "returns an array of the old value and new value" do
-          person.send(:attribute_change, "title").should eq(
+          expect(person.send(:attribute_change, "title")).to eq(
             [ "Grand Poobah", "Captain Obvious" ]
           )
         end
 
         it "allows access via (attribute)_change" do
-          person.title_change.should eq(
+          expect(person.title_change).to eq(
             [ "Grand Poobah", "Captain Obvious" ]
           )
         end
@@ -39,13 +39,13 @@ describe Mongoid::Dirty do
           end
 
           it "returns an array of the old value and new value" do
-            person.send(:attribute_change, "test").should eq(
+            expect(person.send(:attribute_change, "test")).to eq(
               [ "Aliased 1", "Aliased 2" ]
             )
           end
 
           it "allows access via (attribute)_change" do
-            person.test_change.should eq(
+            expect(person.test_change).to eq(
               [ "Aliased 1", "Aliased 2" ]
             )
           end
@@ -63,13 +63,13 @@ describe Mongoid::Dirty do
         end
 
         it "returns an array of the old value and new value" do
-          person.send(:attribute_change, "title").should eq(
+          expect(person.send(:attribute_change, "title")).to eq(
             [ "Grand Poobah", "Captain Obvious" ]
           )
         end
 
         it "allows access via (attribute)_change" do
-          person.title_change.should eq(
+          expect(person.title_change).to eq(
             [ "Grand Poobah", "Captain Obvious" ]
           )
         end
@@ -85,11 +85,11 @@ describe Mongoid::Dirty do
         end
 
         it "returns an array of nil and new value" do
-          person.send(:attribute_change, "pets").should eq([ nil, true ])
+          expect(person.send(:attribute_change, "pets")).to eq([ nil, true ])
         end
 
         it "allows access via (attribute)_change" do
-          person.pets_change.should eq([ nil, true ])
+          expect(person.pets_change).to eq([ nil, true ])
         end
       end
 
@@ -106,11 +106,11 @@ describe Mongoid::Dirty do
           end
 
           it "returns an array of nil and new value" do
-            person.send(:attribute_change, "pets").should eq([ nil, true ])
+            expect(person.send(:attribute_change, "pets")).to eq([ nil, true ])
           end
 
           it "allows access via (attribute)_change" do
-            person.pets_change.should eq([ nil, true ])
+            expect(person.pets_change).to eq([ nil, true ])
           end
         end
 
@@ -121,11 +121,11 @@ describe Mongoid::Dirty do
           end
 
           before do
-            person[:a] = "test"
+            person[:t] = "test"
           end
 
           it "returns an array of nil and new value" do
-            person.send(:attribute_change, "a").should eq([ nil, "test" ])
+            expect(person.send(:attribute_change, "t")).to eq([ nil, "test" ])
           end
         end
       end
@@ -143,13 +143,13 @@ describe Mongoid::Dirty do
       end
 
       it "returns an array of the original value and new value" do
-        person.send(:attribute_change, "title").should eq(
+        expect(person.send(:attribute_change, "title")).to eq(
           [ "Grand Poobah", "Dark Helmet" ]
         )
       end
 
       it "allows access via (attribute)_change" do
-        person.title_change.should eq(
+        expect(person.title_change).to eq(
           [ "Grand Poobah", "Dark Helmet" ]
         )
       end
@@ -168,13 +168,13 @@ describe Mongoid::Dirty do
         end
 
         it "returns an array of the original value and new value" do
-          person.send(:attribute_change, "aliases").should eq(
+          expect(person.send(:attribute_change, "aliases")).to eq(
             [[ "Grand Poobah" ],  [ "Dark Helmet" ]]
           )
         end
 
         it "allows access via (attribute)_change" do
-          person.aliases_change.should eq(
+          expect(person.aliases_change).to eq(
             [[ "Grand Poobah" ],  [ "Dark Helmet" ]]
           )
         end
@@ -186,7 +186,7 @@ describe Mongoid::Dirty do
           end
 
           it "returns an array of the original value and new value" do
-            person.send(:attribute_change, "aliases").should eq(
+            expect(person.send(:attribute_change, "aliases")).to eq(
               [[ "Grand Poobah" ], [ "Dark Helmet", "Colonel Sanders" ]]
             )
           end
@@ -204,13 +204,13 @@ describe Mongoid::Dirty do
         end
 
         it "returns an array of the original value and new value" do
-          person.send(:attribute_change, "map").should eq(
+          expect(person.send(:attribute_change, "map")).to eq(
             [{ location: "Home" }, { location: "Work" }]
           )
         end
 
         it "allows access via (attribute)_change" do
-          person.map_change.should eq(
+          expect(person.map_change).to eq(
             [{ location: "Home" }, { location: "Work" }]
           )
         end
@@ -222,7 +222,7 @@ describe Mongoid::Dirty do
           end
 
           it "returns an array of the original value and new value" do
-            person.send(:attribute_change, "map").should eq(
+            expect(person.send(:attribute_change, "map")).to eq(
               [{ location: "Home" }, { location: "Work", lat: 20.0 }]
             )
           end
@@ -250,7 +250,7 @@ describe Mongoid::Dirty do
             end
 
             it "flags the attribute as changed" do
-              person.send(:attribute_change, "map").should eq(
+              expect(person.send(:attribute_change, "map")).to eq(
                 [
                   {
                     "stack1" => [ 1, 2, 3, 4 ],
@@ -277,7 +277,7 @@ describe Mongoid::Dirty do
       end
 
       it "returns nil" do
-        person.send(:attribute_change, "title").should be_nil
+        expect(person.send(:attribute_change, "title")).to be_nil
       end
     end
 
@@ -290,7 +290,7 @@ describe Mongoid::Dirty do
         end
 
         it "returns the change" do
-          person.send(:attribute_change, "pets").should eq([ nil, false ])
+          expect(person.send(:attribute_change, "pets")).to eq([ nil, false ])
         end
       end
 
@@ -301,7 +301,7 @@ describe Mongoid::Dirty do
         end
 
         it "returns nil" do
-          person.send(:attribute_change, "pets").should be_nil
+          expect(person.send(:attribute_change, "pets")).to be_nil
         end
       end
     end
@@ -317,7 +317,7 @@ describe Mongoid::Dirty do
       end
 
       it "returns an empty array" do
-        person.send(:attribute_change, "title").should be_nil
+        expect(person.send(:attribute_change, "title")).to be_nil
       end
     end
 
@@ -332,7 +332,7 @@ describe Mongoid::Dirty do
       end
 
       it "returns an empty array" do
-        person.send(:attribute_change, "title").should eq(
+        expect(person.send(:attribute_change, "title")).to eq(
           [ "Grand Poobah", nil ]
         )
       end
@@ -352,11 +352,11 @@ describe Mongoid::Dirty do
       end
 
       it "returns true" do
-        person.send(:attribute_changed?, "title").should be_true
+        expect(person.send(:attribute_changed?, "title")).to be true
       end
 
       it "allows access via (attribute)_changed?" do
-        person.title_changed?.should be_true
+        expect(person.title_changed?).to be true
       end
 
       context "when the field is aliased" do
@@ -370,11 +370,11 @@ describe Mongoid::Dirty do
         end
 
         it "returns true" do
-          person.send(:attribute_changed?, "test").should be_true
+          expect(person.send(:attribute_changed?, "test")).to be true
         end
 
         it "allows access via (attribute)_changed?" do
-          person.test_changed?.should be_true
+          expect(person.test_changed?).to be true
         end
       end
     end
@@ -390,11 +390,11 @@ describe Mongoid::Dirty do
       end
 
       it "returns true" do
-        person.send(:attribute_changed?, "pets").should be_true
+        expect(person.send(:attribute_changed?, "pets")).to be true
       end
 
       it "allows access via (attribute)_changed?" do
-        person.pets_changed?.should be_true
+        expect(person.pets_changed?).to be true
       end
     end
 
@@ -405,7 +405,7 @@ describe Mongoid::Dirty do
       end
 
       it "returns false" do
-        person.send(:attribute_changed?, "title").should be_false
+        expect(person.send(:attribute_changed?, "title")).to be false
       end
     end
 
@@ -420,7 +420,7 @@ describe Mongoid::Dirty do
           end
 
           it "returns true" do
-            person.send(:attribute_changed?, "pets").should be_true
+            expect(person.send(:attribute_changed?, "pets")).to be true
           end
         end
 
@@ -431,7 +431,7 @@ describe Mongoid::Dirty do
           end
 
           it "returns false" do
-            person.send(:attribute_changed?, "pets").should be_false
+            expect(person.send(:attribute_changed?, "pets")).to be false
           end
         end
       end
@@ -450,7 +450,7 @@ describe Mongoid::Dirty do
           end
 
           it "returns false" do
-            person.should_not be_aliases_changed
+            expect(person).to_not be_aliases_changed
           end
         end
       end
@@ -469,7 +469,7 @@ describe Mongoid::Dirty do
           end
 
           it "returns false" do
-            person.should_not be_map_changed
+            expect(person).to_not be_map_changed
           end
         end
       end
@@ -485,7 +485,7 @@ describe Mongoid::Dirty do
       end
 
       it "returns true" do
-        person.should be_age_changed_from_default
+        expect(person).to be_age_changed_from_default
       end
     end
 
@@ -496,7 +496,7 @@ describe Mongoid::Dirty do
       end
 
       it "returns false" do
-        person.should_not be_age_changed_from_default
+        expect(person).to_not be_age_changed_from_default
       end
     end
   end
@@ -514,11 +514,11 @@ describe Mongoid::Dirty do
       end
 
       it "returns the old value" do
-        person.send(:attribute_was, "title").should eq("Grand Poobah")
+        expect(person.send(:attribute_was, "title")).to eq("Grand Poobah")
       end
 
       it "allows access via (attribute)_was" do
-        person.title_was.should eq("Grand Poobah")
+        expect(person.title_was).to eq("Grand Poobah")
       end
 
       context "when the field is aliased" do
@@ -532,34 +532,15 @@ describe Mongoid::Dirty do
         end
 
         it "returns the old value" do
-          person.send(:attribute_was, "test").should eq("Aliased 1")
+          expect(person.send(:attribute_was, "test")).to eq("Aliased 1")
         end
 
         it "allows access via (attribute)_was" do
-          person.test_was.should eq("Aliased 1")
+          expect(person.test_was).to eq("Aliased 1")
         end
       end
     end
 
-    context "when the attribute has changed from the default value" do
-
-      let(:person) do
-        Person.new
-      end
-
-      before do
-        person.pets = true
-      end
-
-      it "returns the default value" do
-        person.send(:attribute_was, "pets").should be_false
-      end
-
-      it "allows access via (attribute)_was" do
-        person.pets_was.should be_false
-      end
-    end
-
     context "when the attribute has not changed from the persisted value" do
 
       let!(:person) do
@@ -567,18 +548,7 @@ describe Mongoid::Dirty do
       end
 
       it "returns the original value" do
-        person.send(:attribute_was, "title").should eq("Grand Poobah")
-      end
-    end
-
-    context "when the attribute has not changed from the default value" do
-
-      let(:person) do
-        Person.new
-      end
-
-      it "returns the default value" do
-        person.send(:attribute_was, "pets").should be_false
+        expect(person.send(:attribute_was, "title")).to eq("Grand Poobah")
       end
     end
   end
@@ -608,11 +578,11 @@ describe Mongoid::Dirty do
       end
 
       it "does not return the value in the changes" do
-        changes.should be_empty
+        expect(changes).to be_empty
       end
 
       it "is not flagged as changed" do
-        person.should_not be_changed
+        expect(person).to_not be_changed
       end
     end
 
@@ -628,7 +598,7 @@ describe Mongoid::Dirty do
       end
 
       it "returns the value in the changes" do
-        changes.should eq({ "aliases" => [[ "007" ], [ "007", "008" ]] })
+        expect(changes).to eq({ "aliases" => [[ "007" ], [ "007", "008" ]] })
       end
     end
 
@@ -645,11 +615,11 @@ describe Mongoid::Dirty do
         end
 
         it "clones the value" do
-          changed["aliases"].should_not equal(aliases)
+          expect(changed["aliases"]).to_not equal(aliases)
         end
 
         it "puts the old value in the changes" do
-          changed["aliases"].should eq(aliases)
+          expect(changed["aliases"]).to eq(aliases)
         end
       end
 
@@ -657,7 +627,7 @@ describe Mongoid::Dirty do
 
         before do
           person.changed_attributes["aliases"] = aliases
-          aliases.should_receive(:clone).never
+          expect(aliases).to receive(:clone).never
           person.aliases_will_change!
         end
 
@@ -666,11 +636,11 @@ describe Mongoid::Dirty do
         end
 
         it "does not clone the value" do
-          changed["aliases"].should equal(aliases)
+          expect(changed["aliases"]).to equal(aliases)
         end
 
         it "retains the first value in the changes" do
-          changed["aliases"].should eq(aliases)
+          expect(changed["aliases"]).to eq(aliases)
         end
       end
     end
@@ -689,7 +659,7 @@ describe Mongoid::Dirty do
       end
 
       it "returns an array of changed field names" do
-        person.changed.should include("title")
+        expect(person.changed).to include("title")
       end
     end
 
@@ -700,7 +670,7 @@ describe Mongoid::Dirty do
       end
 
       it "does not include non changed fields" do
-        person.changed.should_not include("title")
+        expect(person.changed).to_not include("title")
       end
     end
 
@@ -721,7 +691,7 @@ describe Mongoid::Dirty do
         end
 
         it "returns true" do
-          person.name.should be_changed
+          expect(person.name).to be_changed
         end
       end
     end
@@ -740,7 +710,7 @@ describe Mongoid::Dirty do
       end
 
       it "returns true" do
-        person.should be_changed
+        expect(person).to be_changed
       end
     end
 
@@ -757,7 +727,7 @@ describe Mongoid::Dirty do
         end
 
         it "returns false" do
-          person.should_not be_changed
+          expect(person).to_not be_changed
         end
       end
 
@@ -772,7 +742,7 @@ describe Mongoid::Dirty do
         end
 
         it "returns true" do
-          person.should be_changed
+          expect(person).to be_changed
         end
       end
 
@@ -783,13 +753,12 @@ describe Mongoid::Dirty do
         end
 
         before do
-          Mongoid.configure.allow_dynamic_fields = true
           person.other_name[:full][:first] = 'Name'
         end
 
         it "returns true" do
-          person.changes.should_not be_empty
-          person.should be_changed
+          expect(person.changes).to_not be_empty
+          expect(person).to be_changed
         end
       end
     end
@@ -797,11 +766,11 @@ describe Mongoid::Dirty do
     context "when the document has not changed" do
 
       let(:acolyte) do
-        Acolyte.instantiate("_id" => Moped::BSON::ObjectId.new)
+        Acolyte.instantiate("_id" => BSON::ObjectId.new)
       end
 
       it "returns false" do
-        acolyte.should_not be_changed
+        expect(acolyte).to_not be_changed
       end
     end
 
@@ -820,7 +789,7 @@ describe Mongoid::Dirty do
       end
 
       it "returns true" do
-        person.should be_changed
+        expect(person).to be_changed
       end
     end
 
@@ -843,7 +812,7 @@ describe Mongoid::Dirty do
       end
 
       it "returns true" do
-        person.should be_changed
+        expect(person).to be_changed
       end
     end
 
@@ -858,7 +827,7 @@ describe Mongoid::Dirty do
       end
 
       it "returns true" do
-        person.should be_changed
+        expect(person).to be_changed
       end
     end
 
@@ -877,7 +846,7 @@ describe Mongoid::Dirty do
       end
 
       it "returns true" do
-        person.should be_changed
+        expect(person).to be_changed
       end
     end
   end
@@ -895,13 +864,13 @@ describe Mongoid::Dirty do
       end
 
       it "returns a hash of changes" do
-        person.changes["title"].should eq(
+        expect(person.changes["title"]).to eq(
           [ nil, "Captain Obvious" ]
         )
       end
 
       it "returns a hash with indifferent access" do
-        person.changes["title"].should eq(
+        expect(person.changes["title"]).to eq(
           [ nil, "Captain Obvious" ]
         )
       end
@@ -910,11 +879,11 @@ describe Mongoid::Dirty do
     context "when the document has not changed" do
 
       let(:acolyte) do
-        Acolyte.instantiate("_id" => Moped::BSON::ObjectId.new)
+        Acolyte.instantiate("_id" => BSON::ObjectId.new)
       end
 
       it "returns an empty hash" do
-        acolyte.changes.should be_empty
+        expect(acolyte.changes).to be_empty
       end
     end
   end
@@ -943,7 +912,7 @@ describe Mongoid::Dirty do
           end
 
           it "contains array changes in the setters" do
-            setters.should eq({ "aliases" => [] })
+            expect(setters).to eq({ "aliases" => [] })
           end
         end
 
@@ -958,7 +927,7 @@ describe Mongoid::Dirty do
           end
 
           it "contains array changes in the setters" do
-            setters.should eq({ "aliases" => [ "007", "008" ] })
+            expect(setters).to eq({ "aliases" => [ "007", "008" ] })
           end
         end
 
@@ -974,7 +943,7 @@ describe Mongoid::Dirty do
           end
 
           it "does not contain array changes in the setters" do
-            setters.should eq({ "aliases" => [ "008" ]})
+            expect(setters).to eq({ "aliases" => [ "008" ]})
           end
         end
       end
@@ -990,7 +959,7 @@ describe Mongoid::Dirty do
         end
 
         it "returns a hash of field names and new values" do
-          person.setters["title"].should eq("Captain Obvious")
+          expect(person.setters["title"]).to eq("Captain Obvious")
         end
       end
 
@@ -1012,7 +981,7 @@ describe Mongoid::Dirty do
         end
 
         it "returns a hash of field names and new values" do
-          address.setters.should eq(
+          expect(address.setters).to eq(
             { "addresses.0.street" => "Bond St" }
           )
         end
@@ -1030,7 +999,7 @@ describe Mongoid::Dirty do
           end
 
           it "returns the proper hash with locations" do
-            location.setters.should eq(
+            expect(location.setters).to eq(
               { "addresses.0.locations.0.name" => "Work" }
             )
           end
@@ -1041,11 +1010,11 @@ describe Mongoid::Dirty do
     context "when the document has not changed" do
 
       let(:acolyte) do
-        Acolyte.instantiate("_id" => Moped::BSON::ObjectId.new)
+        Acolyte.instantiate("_id" => BSON::ObjectId.new)
       end
 
       it "returns an empty hash" do
-        acolyte.setters.should be_empty
+        expect(acolyte.setters).to be_empty
       end
     end
   end
@@ -1067,7 +1036,7 @@ describe Mongoid::Dirty do
       end
 
       it "returns the changes before the save" do
-        person.previous_changes["title"].should eq(
+        expect(person.previous_changes["title"]).to eq(
           [ nil, "Captain Obvious" ]
         )
       end
@@ -1076,7 +1045,7 @@ describe Mongoid::Dirty do
     context "when the document has not been saved" do
 
       it "returns an empty hash" do
-        person.previous_changes.should be_empty
+        expect(person.previous_changes).to be_empty
       end
     end
   end
@@ -1095,19 +1064,19 @@ describe Mongoid::Dirty do
     end
 
     it "clears the atomic pulls" do
-      person.atomic_pulls.should be_empty
+      expect(person.atomic_pulls).to be_empty
     end
 
     it "clears the atomic unsets" do
-      person.atomic_unsets.should be_empty
+      expect(person.atomic_unsets).to be_empty
     end
 
     it "clears the delayed atomic sets" do
-      person.delayed_atomic_sets.should be_empty
+      expect(person.delayed_atomic_sets).to be_empty
     end
 
     it "clears the changed attributes" do
-      person.changed_attributes.should be_empty
+      expect(person.changed_attributes).to be_empty
     end
   end
 
@@ -1125,15 +1094,15 @@ describe Mongoid::Dirty do
       end
 
       it "resets the value to the original" do
-        person.title.should be_nil
+        expect(person.title).to be_nil
       end
 
       it "allows access via reset_(attribute)!" do
-        person.title.should be_nil
+        expect(person.title).to be_nil
       end
 
       it "removes the field from the changes" do
-        person.changed.should_not include("title")
+        expect(person.changed).to_not include("title")
       end
 
       context "when the field is aliased" do
@@ -1148,11 +1117,11 @@ describe Mongoid::Dirty do
         end
 
         it "resets the value to the original" do
-          person.test.should be_nil
+          expect(person.test).to be_nil
         end
 
         it "removes the field from the changes" do
-          person.changed.should_not include("test")
+          expect(person.changed).to_not include("test")
         end
       end
     end
@@ -1168,7 +1137,84 @@ describe Mongoid::Dirty do
       end
 
       it "does nothing" do
-        person.title.should be_nil
+        expect(person.title).to be_nil
+      end
+    end
+  end
+
+  describe "#reset_attribute_to_default!" do
+
+    context "when a default is defined" do
+
+      context "when the document is new" do
+
+        let(:person) do
+          Person.new(pets: true)
+        end
+
+        before do
+          person.reset_pets_to_default!
+        end
+
+        it "resets to the default value" do
+          expect(person.pets).to eq(false)
+        end
+      end
+
+      context "when the document is persisted" do
+
+        let(:person) do
+          Person.create(pets: true)
+        end
+
+        before do
+          person.reset_pets_to_default!
+        end
+
+        it "resets to the default value" do
+          expect(person.pets).to eq(false)
+        end
+
+        it "flags the document dirty" do
+          expect(person).to be_pets_changed
+        end
+      end
+    end
+
+    context "when a default is not defined" do
+
+      context "when the document is new" do
+
+        let(:person) do
+          Person.new(title: "test")
+        end
+
+        before do
+          person.reset_title_to_default!
+        end
+
+        it "resets to nil" do
+          expect(person.title).to be_nil
+        end
+      end
+
+      context "when the document is persisted" do
+
+        let(:person) do
+          Person.create(title: "test")
+        end
+
+        before do
+          person.reset_title_to_default!
+        end
+
+        it "resets to nil" do
+          expect(person.title).to be_nil
+        end
+
+        it "flags the document dirty" do
+          expect(person).to be_title_changed
+        end
       end
     end
   end
@@ -1180,15 +1226,15 @@ describe Mongoid::Dirty do
     end
 
     it "defines a _change method" do
-      document.updated_at_change.should be_nil
+      expect(document.updated_at_change).to be_nil
     end
 
     it "defines a _changed? method" do
-      document.updated_at_changed?.should be_false
+      expect(document.updated_at_changed?).to be false
     end
 
     it "defines a _changes method" do
-      document.updated_at_was.should be_nil
+      expect(document.updated_at_was).to be_nil
     end
   end
 
@@ -1207,7 +1253,7 @@ describe Mongoid::Dirty do
         end
 
         it "flags the parent as changed" do
-          person.should be_changed
+          expect(person).to be_changed
         end
       end
 
@@ -1222,7 +1268,7 @@ describe Mongoid::Dirty do
         end
 
         it "flags the parent as changed" do
-          person.should be_changed
+          expect(person).to be_changed
         end
       end
 
@@ -1233,7 +1279,7 @@ describe Mongoid::Dirty do
         end
 
         it "does not flag the parent as changed" do
-          person.should_not be_changed
+          expect(person).to_not be_changed
         end
       end
     end
@@ -1247,7 +1293,7 @@ describe Mongoid::Dirty do
         end
 
         it "flags the parent as changed" do
-          person.should be_changed
+          expect(person).to be_changed
         end
       end
 
@@ -1262,7 +1308,7 @@ describe Mongoid::Dirty do
         end
 
         it "flags the parent as changed" do
-          person.should be_changed
+          expect(person).to be_changed
         end
       end
 
@@ -1273,7 +1319,7 @@ describe Mongoid::Dirty do
         end
 
         it "does not flag the parent as changed" do
-          person.should_not be_changed
+          expect(person).to_not be_changed
         end
       end
     end
@@ -1290,7 +1336,7 @@ describe Mongoid::Dirty do
     end
 
     it "records the changes" do
-      person.changes.should eq(
+      expect(person.changes).to eq(
         { "map" => [{ "test" => {}}, { "test" => { "value" => 10 }}]}
       )
     end
@@ -1311,7 +1357,7 @@ describe Mongoid::Dirty do
     end
 
     it "records the foreign key dirty changes" do
-      person.previous_changes["preference_ids"].should eq(
+      expect(person.previous_changes["preference_ids"]).to eq(
         [nil, [ preference.id ]]
       )
     end
@@ -1334,11 +1380,11 @@ describe Mongoid::Dirty do
       end
 
       it "flags the change" do
-        from_db.changes["preference_ids"].should eq([ nil, []])
+        expect(from_db.changes["preference_ids"]).to eq([ nil, []])
       end
 
       it "does not include the changes in the setters" do
-        from_db.setters.should be_empty
+        expect(from_db.setters).to be_empty
       end
     end
   end
@@ -1358,7 +1404,7 @@ describe Mongoid::Dirty do
     end
 
     it "clears the changed attributes" do
-      from_db.changed_attributes.should be_empty
+      expect(from_db.changed_attributes).to be_empty
     end
   end
 
@@ -1378,11 +1424,11 @@ describe Mongoid::Dirty do
     end
 
     it "marks the document as changed" do
-      person.should be_changed
+      expect(person).to be_changed
     end
 
     it "marks field changes" do
-      person.changes.should eq({
+      expect(person.changes).to eq({
         "title" => [ "MC", "DJ" ],
         "ssn" => [ nil, "222-22-2222" ],
         "some_dynamic_field" => [ "blah", "bloop" ]
@@ -1390,25 +1436,25 @@ describe Mongoid::Dirty do
     end
 
     it "marks changed fields" do
-      person.changed.should =~ [ "title", "ssn", "some_dynamic_field" ]
+      expect(person.changed).to eq([ "title", "ssn", "some_dynamic_field" ])
     end
 
     it "marks the field as changed" do
-      person.title_changed?.should be_true
+      expect(person.title_changed?).to be true
     end
 
     it "stores previous field values" do
-      person.title_was.should eq("MC")
+      expect(person.title_was).to eq("MC")
     end
 
     it "marks field changes" do
-      person.title_change.should eq([ "MC", "DJ" ])
+      expect(person.title_change).to eq([ "MC", "DJ" ])
     end
 
     it "allows reset of field changes" do
       person.reset_title!
-      person.title.should eq("MC")
-      person.changed.should =~ [ "ssn", "some_dynamic_field" ]
+      expect(person.title).to eq("MC")
+      expect(person.changed).to eq([ "ssn", "some_dynamic_field" ])
     end
 
     context "after a save" do
@@ -1418,12 +1464,12 @@ describe Mongoid::Dirty do
       end
 
       it "clears changes" do
-        person.should_not be_changed
+        expect(person).to_not be_changed
       end
 
       it "stores previous changes" do
-        person.previous_changes["title"].should eq([ "MC", "DJ" ])
-        person.previous_changes["ssn"].should eq([ nil, "222-22-2222" ])
+        expect(person.previous_changes["title"]).to eq([ "MC", "DJ" ])
+        expect(person.previous_changes["ssn"]).to eq([ nil, "222-22-2222" ])
       end
     end
 
@@ -1435,7 +1481,7 @@ describe Mongoid::Dirty do
       end
 
       it "removes the attribute from the document" do
-        person.score.should be_nil
+        expect(person.score).to be_nil
       end
     end
   end
@@ -1455,14 +1501,16 @@ describe Mongoid::Dirty do
       end
 
       after do
-        Acolyte._save_callbacks.reject! do |callback|
+        Acolyte._save_callbacks.select do |callback|
           callback.kind == :after
+        end.each do |callback|
+          Acolyte._save_callbacks.delete(callback)
         end
       end
 
       it "retains the changes until after all callbacks" do
         acolyte.update_attribute(:status, "testing")
-        acolyte.changed_in_callback.should eq({ "status" => [ nil, "testing" ] })
+        expect(acolyte.changed_in_callback).to eq({ "status" => [ nil, "testing" ] })
       end
     end
 
@@ -1479,14 +1527,16 @@ describe Mongoid::Dirty do
       end
 
       after do
-        Acolyte._save_callbacks.reject! do |callback|
+        Acolyte._save_callbacks.select do |callback|
           callback.kind == :after
+        end.each do |callback|
+          Acolyte._save_callbacks.delete(callback)
         end
       end
 
       it "retains the changes until after all callbacks" do
         acolyte.save
-        acolyte.changed_in_callback["name"].should eq([ nil, "callback-test" ])
+        expect(acolyte.changed_in_callback["name"]).to eq([ nil, "callback-test" ])
       end
     end
   end
@@ -1502,7 +1552,7 @@ describe Mongoid::Dirty do
     end
 
     it "does not set the association to nil when hitting the database" do
-      person.setters.should_not eq({ "addresses" => nil })
+      expect(person.setters).to_not eq({ "addresses" => nil })
     end
   end
 end