mongoid 3.1.7 → 4.0.0.alpha1

data/spec/mongoid/{nested_attributes_spec.rb → attributes/nested_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Mongoid::NestedAttributes do
+describe Mongoid::Attributes::Nested do
 
   describe ".accepts_nested_attributes_for" do
 
@@ -65,7 +65,7 @@ describe Mongoid::NestedAttributes do
       end
 
       it "sets the nested attributes" do
-        person.name.first_name.should eq("Johnny")
+        expect(person.name.first_name).to eq("Johnny")
       end
     end
 
@@ -81,7 +81,7 @@ describe Mongoid::NestedAttributes do
       end
 
       it "sets the nested attributes" do
-        person.addresses.first.street.should eq("Alexanderstr")
+        expect(person.addresses.first.street).to eq("Alexanderstr")
       end
 
       context "when there are 10 or more child records" do
@@ -97,7 +97,7 @@ describe Mongoid::NestedAttributes do
         end
 
         it "preserves the order of the children" do
-          person.addresses.map(&:number).should eq((0..10).to_a)
+          expect(person.addresses.map(&:number)).to eq((0..10).to_a)
         end
       end
     end
@@ -113,7 +113,7 @@ describe Mongoid::NestedAttributes do
       end
 
       it "sets the nested attributes" do
-        video.person.title.should eq("Sir")
+        expect(video.person.title).to eq("Sir")
       end
     end
 
@@ -129,7 +129,7 @@ describe Mongoid::NestedAttributes do
       end
 
       it "sets the nested attributes" do
-        person.game.name.should eq("Tron")
+        expect(person.game.name).to eq("Tron")
       end
     end
 
@@ -145,7 +145,7 @@ describe Mongoid::NestedAttributes do
       end
 
       it "sets the nested attributes" do
-        person.posts.first.title.should eq("First")
+        expect(person.posts.first.title).to eq("First")
       end
     end
 
@@ -161,7 +161,7 @@ describe Mongoid::NestedAttributes do
       end
 
       it "sets the nested attributes" do
-        person.preferences.first.name.should eq("First")
+        expect(person.preferences.first.name).to eq("First")
       end
     end
 
@@ -176,7 +176,7 @@ describe Mongoid::NestedAttributes do
       end
 
       it "sets the nested attributes" do
-        post.person.title.should eq("Sir")
+        expect(post.person.title).to eq("Sir")
       end
     end
   end
@@ -210,11 +210,11 @@ describe Mongoid::NestedAttributes do
             end
 
             it "sets the child document" do
-              person.name.last_name.should eq("Fischer")
+              expect(person.name.last_name).to eq("Fischer")
             end
 
             it "does not persist the child document" do
-              person.name.should_not be_persisted
+              expect(person.name).to_not be_persisted
             end
 
             context "when saving the parent" do
@@ -225,7 +225,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "persists the child document" do
-                person.name.should be_persisted
+                expect(person.name).to be_persisted
               end
             end
           end
@@ -255,7 +255,7 @@ describe Mongoid::NestedAttributes do
             end
 
             it "does not add the document" do
-              person.name.should be_nil
+              expect(person.name).to be_nil
             end
           end
 
@@ -266,7 +266,7 @@ describe Mongoid::NestedAttributes do
             end
 
             it "adds the document" do
-              person.name.first_name.should eq("Lang")
+              expect(person.name.first_name).to eq("Lang")
             end
           end
         end
@@ -293,7 +293,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "does not add the document" do
-                person.name.should be_nil
+                expect(person.name).to be_nil
               end
             end
 
@@ -304,7 +304,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "adds the document" do
-                person.name.first_name.should eq("Lang")
+                expect(person.name.first_name).to eq("Lang")
               end
             end
           end
@@ -326,7 +326,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "does not add the document" do
-                product.seo.should_not be_persisted
+                expect(product.seo).to_not be_persisted
               end
             end
           end
@@ -341,7 +341,7 @@ describe Mongoid::NestedAttributes do
             end
 
             it "builds a new document" do
-              person.name.first_name.should eq("Leo")
+              expect(person.name.first_name).to eq("Leo")
             end
           end
 
@@ -366,7 +366,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "does not build the document" do
-                  person.name.should be_nil
+                  expect(person.name).to be_nil
                 end
               end
 
@@ -377,7 +377,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "does not build the document" do
-                  person.name.should be_nil
+                  expect(person.name).to be_nil
                 end
               end
             end
@@ -399,7 +399,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "builds the document" do
-                person.name.first_name.should eq("Leo")
+                expect(person.name.first_name).to eq("Leo")
               end
             end
           end
@@ -411,7 +411,7 @@ describe Mongoid::NestedAttributes do
             end
 
             it "does not build the document" do
-              person.name.should be_nil
+              expect(person.name).to be_nil
             end
           end
 
@@ -425,7 +425,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "replaces the document" do
-                person.name.first_name.should eq("Jack")
+                expect(person.name.first_name).to eq("Jack")
               end
             end
 
@@ -449,7 +449,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "does not replace the document" do
-                  person.name.first_name.should eq("Michael")
+                  expect(person.name.first_name).to eq("Michael")
                 end
               end
 
@@ -471,7 +471,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "replaces the document" do
-                  person.name.first_name.should eq("Jack")
+                  expect(person.name.first_name).to eq("Jack")
                 end
               end
             end
@@ -500,7 +500,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "updates the existing document" do
-                  person.name.first_name.should eq("Bob")
+                  expect(person.name.first_name).to eq("Bob")
                 end
               end
 
@@ -512,7 +512,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "updates the existing document" do
-                  person.name.first_name.should eq("Bob")
+                  expect(person.name.first_name).to eq("Bob")
                 end
               end
 
@@ -540,7 +540,7 @@ describe Mongoid::NestedAttributes do
                       end
 
                       it "destroys the existing document" do
-                        person.name.should be_nil
+                        expect(person.name).to be_nil
                       end
                     end
 
@@ -568,11 +568,11 @@ describe Mongoid::NestedAttributes do
                       end
 
                       it "destroys the existing document" do
-                        owner.pet.should be_nil
+                        expect(owner.pet).to be_nil
                       end
 
                       it "runs the destroy callbacks" do
-                        pet.destroy_flag.should be_true
+                        expect(pet.destroy_flag).to be true
                       end
                     end
                   end
@@ -588,7 +588,7 @@ describe Mongoid::NestedAttributes do
                     end
 
                     it "does not destroy the existing document" do
-                      person.name.should eq(name)
+                      expect(person.name).to eq(name)
                     end
                   end
                 end
@@ -614,7 +614,7 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "does not destroy the document" do
-                    person.name.should eq(name)
+                    expect(person.name).to eq(name)
                   end
                 end
               end
@@ -642,7 +642,7 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "updates the existing document" do
-                    person.name.first_name.should eq("Ro")
+                    expect(person.name.first_name).to eq("Ro")
                   end
                 end
 
@@ -650,11 +650,11 @@ describe Mongoid::NestedAttributes do
 
                   before do
                     person.name_attributes =
-                      { id: Moped::BSON::ObjectId.new.to_s, first_name: "Durran" }
+                      { id: BSON::ObjectId.new.to_s, first_name: "Durran" }
                   end
 
                   it "updates the existing document" do
-                    person.name.first_name.should eq("Durran")
+                    expect(person.name.first_name).to eq("Durran")
                   end
                 end
 
@@ -666,7 +666,7 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "destroys the existing document" do
-                    person.name.should be_nil
+                    expect(person.name).to be_nil
                   end
                 end
               end
@@ -684,7 +684,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "updates the existing document" do
-                  person.quiz.topic.should eq("English")
+                  expect(person.quiz.topic).to eq("English")
                 end
               end
             end
@@ -706,8 +706,8 @@ describe Mongoid::NestedAttributes do
           end
 
           it "propagates invalidity to parent" do
-            person.pet.should_not be_valid
-            person.should_not be_valid
+            expect(person.pet).to_not be_valid
+            expect(person).to_not be_valid
           end
         end
 
@@ -724,7 +724,7 @@ describe Mongoid::NestedAttributes do
           end
 
           it "instantiates an object of the given type" do
-            canvas.writer.class.should eq(HtmlWriter)
+            expect(canvas.writer.class).to eq(HtmlWriter)
           end
         end
       end
@@ -746,7 +746,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "builds a new document" do
-                animal.person.title.should eq("Sir")
+                expect(animal.person.title).to eq("Sir")
               end
 
             end
@@ -770,7 +770,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "does not build a new document" do
-                  animal.person.should be_nil
+                  expect(animal.person).to be_nil
                 end
               end
 
@@ -791,7 +791,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "builds a new document" do
-                  animal.person.title.should eq("Sir")
+                  expect(animal.person.title).to eq("Sir")
                 end
               end
             end
@@ -812,7 +812,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "updates the existing document" do
-                  animal.person.title.should eq("Sir")
+                  expect(animal.person.title).to eq("Sir")
                 end
               end
             end
@@ -845,7 +845,7 @@ describe Mongoid::NestedAttributes do
                     end
 
                     it "destroys the existing document" do
-                      animal.person.should be_nil
+                      expect(animal.person).to be_nil
                     end
                   end
                 end
@@ -860,7 +860,7 @@ describe Mongoid::NestedAttributes do
                     end
 
                     it "does not destroy the existing document" do
-                      animal.person.should eq(person)
+                      expect(animal.person).to eq(person)
                     end
                   end
                 end
@@ -886,7 +886,7 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "does not delete the document" do
-                    animal.person.should eq(person)
+                    expect(animal.person).to eq(person)
                   end
                 end
               end
@@ -909,7 +909,7 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "updates the existing document" do
-                    animal.person.title.should eq("Madam")
+                    expect(animal.person.title).to eq("Madam")
                   end
                 end
 
@@ -917,11 +917,11 @@ describe Mongoid::NestedAttributes do
 
                   before do
                     animal.person_attributes =
-                      { id: Moped::BSON::ObjectId.new.to_s, title: "Madam" }
+                      { id: BSON::ObjectId.new.to_s, title: "Madam" }
                   end
 
                   it "updates the existing document" do
-                    animal.person.title.should eq("Madam")
+                    expect(animal.person.title).to eq("Madam")
                   end
                 end
 
@@ -933,7 +933,7 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "deletes the existing document" do
-                    animal.person.should be_nil
+                    expect(animal.person).to be_nil
                   end
                 end
               end
@@ -955,8 +955,8 @@ describe Mongoid::NestedAttributes do
             end
 
             it "does not propagate invalidity to parent" do
-              animal.person.should_not be_valid
-              animal.should be_valid
+              expect(animal.person).to_not be_valid
+              expect(animal).to be_valid
             end
           end
         end
@@ -972,7 +972,7 @@ describe Mongoid::NestedAttributes do
           end
 
           it "instantiates an object of the given type" do
-            tool.palette.class.should eq(BigPalette)
+            expect(tool.palette.class).to eq(BigPalette)
           end
         end
       end
@@ -1006,11 +1006,11 @@ describe Mongoid::NestedAttributes do
             end
 
             it "sets the child documents" do
-              person.addresses.first.street.should eq("Maybachufer")
+              expect(person.addresses.first.street).to eq("Maybachufer")
             end
 
             it "does not persist the child documents" do
-              person.addresses.first.should_not be_persisted
+              expect(person.addresses.first).to_not be_persisted
             end
 
             context "when saving the parent" do
@@ -1021,7 +1021,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "saves the child documents" do
-                person.addresses.first.should be_persisted
+                expect(person.addresses.first).to be_persisted
               end
             end
           end
@@ -1039,14 +1039,6 @@ describe Mongoid::NestedAttributes do
           Address.new(street: "Kurfeurstendamm")
         end
 
-        let(:phone_one) do
-          ParanoidPhone.new(number: "1")
-        end
-
-        let(:phone_two) do
-          ParanoidPhone.new(number: "2")
-        end
-
         context "when a limit is specified" do
 
           before(:all) do
@@ -1090,7 +1082,7 @@ describe Mongoid::NestedAttributes do
             end
 
             it "sets the documents on the relation" do
-              person.addresses.size.should eq(2)
+              expect(person.addresses.size).to eq(2)
             end
           end
 
@@ -1108,7 +1100,7 @@ describe Mongoid::NestedAttributes do
             end
 
             it "sets the documents on the relation" do
-              person.addresses.size.should eq(2)
+              expect(person.addresses.size).to eq(2)
             end
           end
 
@@ -1144,11 +1136,11 @@ describe Mongoid::NestedAttributes do
               end
 
               it "runs the first child create callbacks" do
-                band.records.first.before_create_called.should be_true
+                expect(band.records.first.before_create_called).to be true
               end
 
               it "runs the last child create callbacks" do
-                band.records.last.before_create_called.should be_true
+                expect(band.records.last.before_create_called).to be true
               end
             end
           end
@@ -1173,15 +1165,15 @@ describe Mongoid::NestedAttributes do
               end
 
               it "updates the first existing document" do
-                person.addresses.first.street.should eq("Maybachufer")
+                expect(person.addresses.first.street).to eq("Maybachufer")
               end
 
               it "updates the second existing document" do
-                person.addresses.second.street.should eq("Alexander Platz")
+                expect(person.addresses.second.street).to eq("Alexander Platz")
               end
 
               it "does not add new documents" do
-                person.addresses.size.should eq(2)
+                expect(person.addresses.size).to eq(2)
               end
             end
 
@@ -1198,15 +1190,15 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "updates the first existing document" do
-                  person.addresses.collect { |a| a['street'] }.should include('Maybachufer')
+                  expect(person.addresses.collect { |a| a['street'] }).to include('Maybachufer')
                 end
 
                 it "updates the second existing document" do
-                  person.addresses.collect { |a| a['street'] }.should include('Alexander Platz')
+                  expect(person.addresses.collect { |a| a['street'] }).to include('Alexander Platz')
                 end
 
                 it "does not add new documents" do
-                  person.addresses.size.should eq(2)
+                  expect(person.addresses.size).to eq(2)
                 end
               end
 
@@ -1221,15 +1213,15 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "updates the first existing document" do
-                  person.addresses.collect { |a| a['street'] }.should include('Maybachufer')
+                  expect(person.addresses.collect { |a| a['street'] }).to include('Maybachufer')
                 end
 
                 it "updates the second existing document" do
-                  person.addresses.collect { |a| a['street'] }.should include('Alexander Platz')
+                  expect(person.addresses.collect { |a| a['street'] }).to include('Alexander Platz')
                 end
 
                 it "does not add new documents" do
-                  person.addresses.size.should eq(2)
+                  expect(person.addresses.size).to eq(2)
                 end
               end
             end
@@ -1245,15 +1237,15 @@ describe Mongoid::NestedAttributes do
               end
 
               it "updates the first existing document" do
-                person.addresses.collect { |a| a['street'] }.should include('Maybachufer')
+                expect(person.addresses.collect { |a| a['street'] }).to include('Maybachufer')
               end
 
               it "updates the second existing document" do
-                person.addresses.collect { |a| a['street'] }.should include('Alexander Platz')
+                expect(person.addresses.collect { |a| a['street'] }).to include('Alexander Platz')
               end
 
               it "does not add new documents" do
-                person.addresses.size.should eq(2)
+                expect(person.addresses.size).to eq(2)
               end
             end
 
@@ -1268,15 +1260,15 @@ describe Mongoid::NestedAttributes do
               end
 
               it "updates the first existing document" do
-                person.addresses.collect { |a| a['street'] }.should include('Maybachufer')
+                expect(person.addresses.collect { |a| a['street'] }).to include('Maybachufer')
               end
 
               it "updates the second existing document" do
-                person.addresses.collect { |a| a['street'] }.should include('Alexander Platz')
+                expect(person.addresses.collect { |a| a['street'] }).to include('Alexander Platz')
               end
 
               it "does not add new documents" do
-                person.addresses.size.should eq(2)
+                expect(person.addresses.size).to eq(2)
               end
             end
 
@@ -1291,15 +1283,15 @@ describe Mongoid::NestedAttributes do
               end
 
               it "updates the first existing document" do
-                person.addresses.collect { |a| a['street'] }.should include('Maybachufer')
+                expect(person.addresses.collect { |a| a['street'] }).to include('Maybachufer')
               end
 
               it "updates the second existing document" do
-                person.addresses.collect { |a| a['street'] }.should include('Alexander Platz')
+                expect(person.addresses.collect { |a| a['street'] }).to include('Alexander Platz')
               end
 
               it "does not add new documents" do
-                person.addresses.size.should eq(2)
+                expect(person.addresses.size).to eq(2)
               end
             end
 
@@ -1352,15 +1344,15 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "does not remove the child document" do
-                    band.records.should_not be_empty
+                    expect(band.records).to_not be_empty
                   end
 
                   it "keeps the child flagged for destruction" do
-                    record.should be_flagged_for_destroy
+                    expect(record).to be_flagged_for_destroy
                   end
 
                   it "does not persist any change" do
-                    band.reload.records.should eq([ record ])
+                    expect(band.reload.records).to eq([ record ])
                   end
                 end
 
@@ -1389,11 +1381,11 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "deletes the child document" do
-                    band.records.should be_empty
+                    expect(band.records).to be_empty
                   end
 
                   it "persists the changes" do
-                    band.reload.records.should be_empty
+                    expect(band.reload.records).to be_empty
                   end
                 end
 
@@ -1415,31 +1407,6 @@ describe Mongoid::NestedAttributes do
 
                     context "when the child returns false in a before callback" do
 
-                      context "when the child is paranoid" do
-
-                        before(:all) do
-                          Person.accepts_nested_attributes_for :paranoid_phones, allow_destroy: true
-                        end
-
-                        after(:all) do
-                          Person.send(:undef_method, :paranoid_phones=)
-                          Person.accepts_nested_attributes_for :paranoid_phones
-                        end
-
-                        let!(:phone) do
-                          persisted.paranoid_phones.create
-                        end
-
-                        before do
-                          persisted.paranoid_phones_attributes =
-                            { "foo" => { "id" => phone.id, "number" => 42, "_destroy" => true }}
-                        end
-
-                        it "does not destroy the child" do
-                          persisted.reload.paranoid_phones.should_not be_empty
-                        end
-                      end
-
                       context "when the child is not paranoid" do
 
                         let(:actor) do
@@ -1457,7 +1424,7 @@ describe Mongoid::NestedAttributes do
                         end
 
                         it "does not destroy the child" do
-                          actor.reload.things.should_not be_empty
+                          expect(actor.reload.things).to_not be_empty
                         end
                       end
                     end
@@ -1490,11 +1457,11 @@ describe Mongoid::NestedAttributes do
                         end
 
                         it "destroys both children" do
-                          from_db.appointments.should be_empty
+                          expect(from_db.appointments).to be_empty
                         end
 
                         it "persists the deletes" do
-                          from_db.reload.appointments.should be_empty
+                          expect(from_db.reload.appointments).to be_empty
                         end
                       end
                     end
@@ -1530,11 +1497,11 @@ describe Mongoid::NestedAttributes do
                           end
 
                           it "deletes the marked document" do
-                            person.addresses.size.should eq(1)
+                            expect(person.addresses.size).to eq(1)
                           end
 
                           it "does not delete the unmarked document" do
-                            person.addresses.first.street.should eq("Alexander Platz")
+                            expect(person.addresses.first.street).to eq("Alexander Platz")
                           end
                         end
 
@@ -1549,11 +1516,11 @@ describe Mongoid::NestedAttributes do
                           end
 
                           it "deletes the marked document" do
-                            person.addresses.size.should eq(1)
+                            expect(person.addresses.size).to eq(1)
                           end
 
                           it "does not delete the unmarked document" do
-                            person.addresses.first.street.should eq("Alexander Platz")
+                            expect(person.addresses.first.street).to eq("Alexander Platz")
                           end
                         end
                       end
@@ -1578,51 +1545,51 @@ describe Mongoid::NestedAttributes do
                           end
 
                           it "does not remove the first document from the relation" do
-                            persisted.addresses.size.should eq(3)
+                            expect(persisted.addresses.size).to eq(3)
                           end
 
                           it "flags the destroyed document for removal" do
-                            address_one.should be_marked_for_destruction
+                            expect(address_one).to be_marked_for_destruction
                           end
 
                           it "does not delete the unmarked document" do
-                            persisted.addresses.second.street.should eq(
+                            expect(persisted.addresses.second.street).to eq(
                               "Alexander Platz"
                             )
                           end
 
                           it "adds the new document to the relation" do
-                            persisted.addresses.last.street.should eq(
+                            expect(persisted.addresses.last.street).to eq(
                               "Potsdammer Platz"
                             )
                           end
 
                           it "has the proper persisted count" do
-                            persisted.addresses.count.should eq(2)
+                            expect(persisted.addresses.count).to eq(2)
                           end
 
                           it "does not delete the removed document" do
-                            address_one.should_not be_destroyed
+                            expect(address_one).to_not be_destroyed
                           end
 
                           context "when saving the parent" do
 
                             before do
-                              persisted.with(safe: true).save
+                              persisted.save
                             end
 
                             it "deletes the marked document from the relation" do
-                              persisted.reload.addresses.count.should eq(2)
+                              expect(persisted.reload.addresses.count).to eq(2)
                             end
 
                             it "does not delete the unmarked document" do
-                              persisted.reload.addresses.first.street.should eq(
+                              expect(persisted.reload.addresses.first.street).to eq(
                                 "Alexander Platz"
                               )
                             end
 
                             it "persists the new document to the relation" do
-                              persisted.reload.addresses.last.street.should eq(
+                              expect(persisted.reload.addresses.last.street).to eq(
                                 "Potsdammer Platz"
                               )
                             end
@@ -1640,39 +1607,39 @@ describe Mongoid::NestedAttributes do
                           end
 
                           it "does not remove the first document from the relation" do
-                            persisted.addresses.size.should eq(3)
+                            expect(persisted.addresses.size).to eq(3)
                           end
 
                           it "marks the first document for destruction" do
-                            address_one.should be_marked_for_destruction
+                            expect(address_one).to be_marked_for_destruction
                           end
 
                           it "adds the new document to the relation" do
-                            persisted.addresses.last.street.should eq(
+                            expect(persisted.addresses.last.street).to eq(
                               "Potsdammer Platz"
                             )
                           end
 
                           it "has the proper persisted count" do
-                            persisted.addresses.count.should eq(2)
+                            expect(persisted.addresses.count).to eq(2)
                           end
 
                           it "does not delete the removed document" do
-                            address_one.should_not be_destroyed
+                            expect(address_one).to_not be_destroyed
                           end
 
                           context "when saving the parent" do
 
                             before do
-                              persisted.with(safe: true).save
+                              persisted.save
                             end
 
                             it "deletes the marked document from the relation" do
-                              persisted.reload.addresses.count.should eq(2)
+                              expect(persisted.reload.addresses.count).to eq(2)
                             end
 
                             it "persists the new document to the relation" do
-                              persisted.reload.addresses.last.street.should eq(
+                              expect(persisted.reload.addresses.last.street).to eq(
                                 "Potsdammer Platz"
                               )
                             end
@@ -1695,91 +1662,11 @@ describe Mongoid::NestedAttributes do
                       end
 
                       it "does not delete the marked document" do
-                        person.addresses.size.should eq(2)
+                        expect(person.addresses.size).to eq(2)
                       end
 
                       it "does not delete the unmarked document" do
-                        person.addresses.last.street.should eq("Alexander Platz")
-                      end
-                    end
-                  end
-                end
-
-                context "when the child is paranoid" do
-
-                  before(:all) do
-                    Person.send(:undef_method, :paranoid_phones_attributes=)
-                    Person.accepts_nested_attributes_for :paranoid_phones,
-                      allow_destroy: true
-                  end
-
-                  after(:all) do
-                    Person.send(:undef_method, :paranoid_phones_attributes=)
-                    Person.accepts_nested_attributes_for :paranoid_phones
-                  end
-
-                  [ 1, "1", true, "true" ].each do |truth|
-
-                    context "when passed a #{truth} with destroy" do
-
-                      context "when the parent is persisted" do
-
-                        let!(:persisted) do
-                          Person.create do |p|
-                            p.paranoid_phones << [ phone_one, phone_two ]
-                          end
-                        end
-
-                        context "when setting, pulling, and pushing in one op" do
-
-                          before do
-                            persisted.paranoid_phones_attributes =
-                              {
-                                "bar" => { "id" => phone_one.id, "_destroy" => truth },
-                                "foo" => { "id" => phone_two.id, "number" => "3" },
-                                "baz" => { "number" => "4" }
-                              }
-                          end
-
-                          it "removes the first document from the relation" do
-                            persisted.paranoid_phones.size.should eq(2)
-                          end
-
-                          it "does not delete the unmarked document" do
-                            persisted.paranoid_phones.first.number.should eq("3")
-                          end
-
-                          it "adds the new document to the relation" do
-                            persisted.paranoid_phones.last.number.should eq("4")
-                          end
-
-                          it "has the proper persisted count" do
-                            persisted.paranoid_phones.count.should eq(1)
-                          end
-
-                          it "soft deletes the removed document" do
-                            phone_one.should be_destroyed
-                          end
-
-                          context "when saving the parent" do
-
-                            before do
-                              persisted.with(safe: true).save
-                            end
-
-                            it "deletes the marked document from the relation" do
-                              persisted.reload.paranoid_phones.count.should eq(2)
-                            end
-
-                            it "does not delete the unmarked document" do
-                              persisted.reload.paranoid_phones.first.number.should eq("3")
-                            end
-
-                            it "persists the new document to the relation" do
-                              persisted.reload.paranoid_phones.last.number.should eq("4")
-                            end
-                          end
-                        end
+                        expect(person.addresses.last.street).to eq("Alexander Platz")
                       end
                     end
                   end
@@ -1812,15 +1699,15 @@ describe Mongoid::NestedAttributes do
                     end
 
                     it "does not ignore the marked document" do
-                      person.addresses.first.street.should eq("Maybachufer")
+                      expect(person.addresses.first.street).to eq("Maybachufer")
                     end
 
                     it "does not delete the unmarked document" do
-                      person.addresses.last.street.should eq("Alexander Platz")
+                      expect(person.addresses.last.street).to eq("Alexander Platz")
                     end
 
                     it "does not add additional documents" do
-                      person.addresses.size.should eq(2)
+                      expect(person.addresses.size).to eq(2)
                     end
                   end
                 end
@@ -1838,11 +1725,11 @@ describe Mongoid::NestedAttributes do
                     end
 
                     it "does not delete the marked document" do
-                      person.addresses.size.should eq(2)
+                      expect(person.addresses.size).to eq(2)
                     end
 
                     it "does not delete the unmarked document" do
-                      person.addresses.last.street.should eq("Alexander Platz")
+                      expect(person.addresses.last.street).to eq("Alexander Platz")
                     end
                   end
                 end
@@ -1869,15 +1756,15 @@ describe Mongoid::NestedAttributes do
                     end
 
                     it "does not ignore the marked document" do
-                      person.addresses.first.street.should eq("Maybachufer")
+                      expect(person.addresses.first.street).to eq("Maybachufer")
                     end
 
                     it "does not delete the unmarked document" do
-                      person.addresses.last.street.should eq("Alexander Platz")
+                      expect(person.addresses.last.street).to eq("Alexander Platz")
                     end
 
                     it "does not add additional documents" do
-                      person.addresses.size.should eq(2)
+                      expect(person.addresses.size).to eq(2)
                     end
                   end
                 end
@@ -1895,11 +1782,11 @@ describe Mongoid::NestedAttributes do
                     end
 
                     it "does not delete the marked document" do
-                      person.addresses.size.should eq(2)
+                      expect(person.addresses.size).to eq(2)
                     end
 
                     it "does not delete the unmarked document" do
-                      person.addresses.last.street.should eq("Alexander Platz")
+                      expect(person.addresses.last.street).to eq("Alexander Platz")
                     end
                   end
                 end
@@ -1922,23 +1809,23 @@ describe Mongoid::NestedAttributes do
             end
 
             it "builds a new first document" do
-              person.addresses.first.street.should eq("Frederichstrasse")
+              expect(person.addresses.first.street).to eq("Frederichstrasse")
             end
 
             it "builds a new second document" do
-              person.addresses.second.street.should eq("Alexander Platz")
+              expect(person.addresses.second.street).to eq("Alexander Platz")
             end
 
             it "builds a new third document" do
-              person.addresses.third.street.should eq("Maybachufer")
+              expect(person.addresses.third.street).to eq("Maybachufer")
             end
 
             it "does not add extra documents" do
-              person.addresses.size.should eq(3)
+              expect(person.addresses.size).to eq(3)
             end
 
             it "adds the documents in the sorted hash key order" do
-              person.addresses.map(&:street).should eq(
+              expect(person.addresses.map(&:street)).to eq(
                 [ "Frederichstrasse", "Alexander Platz", "Maybachufer" ]
               )
             end
@@ -1965,7 +1852,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "does not add the new document" do
-                person.addresses.should be_empty
+                expect(person.addresses).to be_empty
               end
             end
 
@@ -1977,11 +1864,11 @@ describe Mongoid::NestedAttributes do
               end
 
               it "adds the new document" do
-                person.addresses.size.should eq(1)
+                expect(person.addresses.size).to eq(1)
               end
 
               it "sets the correct attributes" do
-                person.addresses.first.street.should eq("Maybachufer")
+                expect(person.addresses.first.street).to eq("Maybachufer")
               end
             end
           end
@@ -2007,7 +1894,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "does not add the new document" do
-                person.addresses.should be_empty
+                expect(person.addresses).to be_empty
               end
             end
 
@@ -2019,11 +1906,11 @@ describe Mongoid::NestedAttributes do
               end
 
               it "adds the new document" do
-                person.addresses.size.should eq(1)
+                expect(person.addresses.size).to eq(1)
               end
 
               it "sets the correct attributes" do
-                person.addresses.first.street.should eq("Maybachufer")
+                expect(person.addresses.first.street).to eq("Maybachufer")
               end
             end
           end
@@ -2055,11 +1942,11 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "ignores the the marked document" do
-                    person.addresses.size.should eq(1)
+                    expect(person.addresses.size).to eq(1)
                   end
 
                   it "adds the new unmarked document" do
-                    person.addresses.first.street.should eq("Alexander Platz")
+                    expect(person.addresses.first.street).to eq("Alexander Platz")
                   end
                 end
               end
@@ -2077,15 +1964,15 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "adds the new marked document" do
-                    person.addresses.first.street.should eq("Maybachufer")
+                    expect(person.addresses.first.street).to eq("Maybachufer")
                   end
 
                   it "adds the new unmarked document" do
-                    person.addresses.last.street.should eq("Alexander Platz")
+                    expect(person.addresses.last.street).to eq("Alexander Platz")
                   end
 
                   it "does not add extra documents" do
-                    person.addresses.size.should eq(2)
+                    expect(person.addresses.size).to eq(2)
                   end
                 end
               end
@@ -2116,15 +2003,15 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "adds the the marked document" do
-                    person.addresses.first.street.should eq("Maybachufer")
+                    expect(person.addresses.first.street).to eq("Maybachufer")
                   end
 
                   it "adds the new unmarked document" do
-                    person.addresses.last.street.should eq("Alexander Platz")
+                    expect(person.addresses.last.street).to eq("Alexander Platz")
                   end
 
                   it "adds the correct number of documents" do
-                    person.addresses.size.should eq(2)
+                    expect(person.addresses.size).to eq(2)
                   end
                 end
               end
@@ -2142,15 +2029,15 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "adds the new marked document" do
-                    person.addresses.first.street.should eq("Maybachufer")
+                    expect(person.addresses.first.street).to eq("Maybachufer")
                   end
 
                   it "adds the new unmarked document" do
-                    person.addresses.last.street.should eq("Alexander Platz")
+                    expect(person.addresses.last.street).to eq("Alexander Platz")
                   end
 
                   it "does not add extra documents" do
-                    person.addresses.size.should eq(2)
+                    expect(person.addresses.size).to eq(2)
                   end
                 end
               end
@@ -2176,15 +2063,15 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "adds the the marked document" do
-                    person.addresses.first.street.should eq("Maybachufer")
+                    expect(person.addresses.first.street).to eq("Maybachufer")
                   end
 
                   it "adds the new unmarked document" do
-                    person.addresses.last.street.should eq("Alexander Platz")
+                    expect(person.addresses.last.street).to eq("Alexander Platz")
                   end
 
                   it "adds the correct number of documents" do
-                    person.addresses.size.should eq(2)
+                    expect(person.addresses.size).to eq(2)
                   end
                 end
               end
@@ -2202,15 +2089,15 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "adds the new marked document" do
-                    person.addresses.first.street.should eq("Maybachufer")
+                    expect(person.addresses.first.street).to eq("Maybachufer")
                   end
 
                   it "adds the new unmarked document" do
-                    person.addresses.last.street.should eq("Alexander Platz")
+                    expect(person.addresses.last.street).to eq("Alexander Platz")
                   end
 
                   it "does not add extra documents" do
-                    person.addresses.size.should eq(2)
+                    expect(person.addresses.size).to eq(2)
                   end
                 end
               end
@@ -2238,7 +2125,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "does not add the document" do
-                person.addresses.should be_empty
+                expect(person.addresses).to be_empty
               end
             end
           end
@@ -2261,8 +2148,8 @@ describe Mongoid::NestedAttributes do
           end
 
           it "propagates invalidity to parent" do
-            person.addresses.first.should_not be_valid
-            person.should_not be_valid
+            expect(person.addresses.first).to_not be_valid
+            expect(person).to_not be_valid
           end
         end
 
@@ -2283,7 +2170,7 @@ describe Mongoid::NestedAttributes do
           end
 
           it "instantiates an object of the given type" do
-            canvas.shapes.map(&:class).should eq([Square, Circle])
+            expect(canvas.shapes.map(&:class)).to eq([Square, Circle])
           end
         end
       end
@@ -2314,7 +2201,7 @@ describe Mongoid::NestedAttributes do
             end
 
             it "does not add the document" do
-              person.game.should be_nil
+              expect(person.game).to be_nil
             end
           end
 
@@ -2325,7 +2212,7 @@ describe Mongoid::NestedAttributes do
             end
 
             it "adds the document" do
-              person.game.name.should eq("Tron")
+              expect(person.game.name).to eq("Tron")
             end
           end
         end
@@ -2350,7 +2237,7 @@ describe Mongoid::NestedAttributes do
             end
 
             it "does not add the document" do
-              person.game.should be_nil
+              expect(person.game).to be_nil
             end
           end
 
@@ -2361,7 +2248,7 @@ describe Mongoid::NestedAttributes do
             end
 
             it "adds the document" do
-              person.game.name.should eq("Tron")
+              expect(person.game.name).to eq("Tron")
             end
           end
         end
@@ -2375,7 +2262,7 @@ describe Mongoid::NestedAttributes do
             end
 
             it "builds a new document" do
-              person.game.name.should eq("Tron")
+              expect(person.game.name).to eq("Tron")
             end
           end
 
@@ -2398,7 +2285,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "does not build the document" do
-                person.game.should be_nil
+                expect(person.game).to be_nil
               end
             end
 
@@ -2419,7 +2306,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "builds the document" do
-                person.game.name.should eq("Tron")
+                expect(person.game.name).to eq("Tron")
               end
             end
           end
@@ -2431,7 +2318,7 @@ describe Mongoid::NestedAttributes do
             end
 
             it "does not build the document" do
-              person.game.should be_nil
+              expect(person.game).to be_nil
             end
           end
 
@@ -2445,7 +2332,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "replaces the document" do
-                person.game.name.should eq("Pong")
+                expect(person.game.name).to eq("Pong")
               end
             end
 
@@ -2461,7 +2348,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "persists the attribute changes" do
-                pizza.reload.topping.name.should eq("onions")
+                expect(pizza.reload.topping.name).to eq("onions")
               end
             end
 
@@ -2485,7 +2372,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "does not replace the document" do
-                  person.game.name.should eq("Tron")
+                  expect(person.game.name).to eq("Tron")
                 end
               end
 
@@ -2507,7 +2394,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "replaces the document" do
-                  person.game.name.should eq("Pong")
+                  expect(person.game.name).to eq("Pong")
                 end
               end
             end
@@ -2536,7 +2423,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "updates the existing document" do
-                  person.game.name.should eq("Pong")
+                  expect(person.game.name).to eq("Pong")
                 end
               end
 
@@ -2548,7 +2435,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "updates the existing document" do
-                  person.game.name.should eq("Pong")
+                  expect(person.game.name).to eq("Pong")
                 end
               end
 
@@ -2574,7 +2461,7 @@ describe Mongoid::NestedAttributes do
                     end
 
                     it "destroys the existing document" do
-                      person.game.should be_nil
+                      expect(person.game).to be_nil
                     end
                   end
                 end
@@ -2589,7 +2476,7 @@ describe Mongoid::NestedAttributes do
                     end
 
                     it "does not destroy the existing document" do
-                      person.game.should eq(game)
+                      expect(person.game).to eq(game)
                     end
                   end
                 end
@@ -2615,7 +2502,7 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "does not destroy the document" do
-                    person.game.should eq(game)
+                    expect(person.game).to eq(game)
                   end
                 end
               end
@@ -2643,7 +2530,7 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "updates the existing document" do
-                    person.game.name.should eq("Donkey Kong")
+                    expect(person.game.name).to eq("Donkey Kong")
                   end
                 end
 
@@ -2651,11 +2538,11 @@ describe Mongoid::NestedAttributes do
 
                   before do
                     person.game_attributes =
-                      { id: Moped::BSON::ObjectId.new.to_s, name: "Pong" }
+                      { id: BSON::ObjectId.new.to_s, name: "Pong" }
                   end
 
                   it "updates the existing document" do
-                    person.game.name.should eq("Pong")
+                    expect(person.game.name).to eq("Pong")
                   end
                 end
 
@@ -2667,7 +2554,7 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "destroys the existing document" do
-                    person.game.should be_nil
+                    expect(person.game).to be_nil
                   end
                 end
               end
@@ -2690,8 +2577,8 @@ describe Mongoid::NestedAttributes do
           end
 
           it "propagates invalidity to parent" do
-            person.game.should_not be_valid
-            person.should_not be_valid
+            expect(person.game).to_not be_valid
+            expect(person).to_not be_valid
           end
         end
 
@@ -2708,7 +2595,7 @@ describe Mongoid::NestedAttributes do
           end
 
           it "instantiates an object of the given type" do
-            driver.vehicle.class.should eq(Truck)
+            expect(driver.vehicle.class).to eq(Truck)
           end
         end
       end
@@ -2730,7 +2617,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "builds a new document" do
-                game.person.title.should eq("Sir")
+                expect(game.person.title).to eq("Sir")
               end
 
             end
@@ -2754,7 +2641,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "does not build a new document" do
-                  game.person.should be_nil
+                  expect(game.person).to be_nil
                 end
               end
 
@@ -2775,7 +2662,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "builds a new document" do
-                  game.person.title.should eq("Sir")
+                  expect(game.person.title).to eq("Sir")
                 end
               end
             end
@@ -2796,7 +2683,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "updates the existing document" do
-                  game.person.title.should eq("Sir")
+                  expect(game.person.title).to eq("Sir")
                 end
               end
             end
@@ -2829,7 +2716,7 @@ describe Mongoid::NestedAttributes do
                     end
 
                     it "destroys the existing document" do
-                      game.person.should be_nil
+                      expect(game.person).to be_nil
                     end
                   end
                 end
@@ -2844,7 +2731,7 @@ describe Mongoid::NestedAttributes do
                     end
 
                     it "does not destroy the existing document" do
-                      game.person.should eq(person)
+                      expect(game.person).to eq(person)
                     end
                   end
                 end
@@ -2870,7 +2757,7 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "does not delete the document" do
-                    game.person.should eq(person)
+                    expect(game.person).to eq(person)
                   end
                 end
               end
@@ -2893,7 +2780,7 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "updates the existing document" do
-                    game.person.title.should eq("Madam")
+                    expect(game.person.title).to eq("Madam")
                   end
                 end
 
@@ -2901,11 +2788,11 @@ describe Mongoid::NestedAttributes do
 
                   before do
                     game.person_attributes =
-                      { id: Moped::BSON::ObjectId.new.to_s, title: "Madam" }
+                      { id: BSON::ObjectId.new.to_s, title: "Madam" }
                   end
 
                   it "updates the existing document" do
-                    game.person.title.should eq("Madam")
+                    expect(game.person.title).to eq("Madam")
                   end
                 end
 
@@ -2917,7 +2804,7 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "deletes the existing document" do
-                    game.person.should be_nil
+                    expect(game.person).to be_nil
                   end
                 end
               end
@@ -2939,8 +2826,8 @@ describe Mongoid::NestedAttributes do
             end
 
             it "propagates invalidity to parent" do
-              game.person.should_not be_valid
-              game.should_not be_valid
+              expect(game.person).to_not be_valid
+              expect(game).to_not be_valid
             end
           end
         end
@@ -2958,7 +2845,7 @@ describe Mongoid::NestedAttributes do
           end
 
           it "instantiates an object of the given type" do
-            vehicle.driver.class.should eq(Learner)
+            expect(vehicle.driver.class).to eq(Learner)
           end
         end
       end
@@ -3020,11 +2907,11 @@ describe Mongoid::NestedAttributes do
             end
 
             it "sets the documents on the relation" do
-              person.posts.size.should eq(2)
+              expect(person.posts.size).to eq(2)
             end
 
             it "does not persist the new documents" do
-              person.posts.count.should eq(0)
+              expect(person.posts.count).to eq(0)
             end
           end
         end
@@ -3054,15 +2941,15 @@ describe Mongoid::NestedAttributes do
               context "when reloading the document" do
 
                 it "updates the first existing document" do
-                  person.posts(true).first.title.should eq("First")
+                  expect(person.posts(true).first.title).to eq("First")
                 end
 
                 it "updates the second existing document" do
-                  person.posts(true).last.title.should eq("Second")
+                  expect(person.posts(true).last.title).to eq("Second")
                 end
 
                 it "does not add new documents" do
-                  person.posts(true).size.should eq(2)
+                  expect(person.posts(true).size).to eq(2)
                 end
               end
 
@@ -3076,7 +2963,7 @@ describe Mongoid::NestedAttributes do
                   expect {
                     person.posts_attributes =
                       { "0" =>
-                        { "id" => Moped::BSON::ObjectId.new.to_s, "title" => "Rogue" }
+                        { "id" => BSON::ObjectId.new.to_s, "title" => "Rogue" }
                       }
                   }.to raise_error(Mongoid::Errors::DocumentNotFound)
                 end
@@ -3101,7 +2988,7 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "does not perist the invalid value" do
-                  post_two.reload.title.should eq("First response")
+                  expect(post_two.reload.title).to eq("First response")
                 end
               end
             end
@@ -3148,11 +3035,11 @@ describe Mongoid::NestedAttributes do
                     context "when reloading the documents" do
 
                       it "deletes the marked document" do
-                        person.posts(true).size.should eq(1)
+                        expect(person.posts(true).size).to eq(1)
                       end
 
                       it "does not delete the unmarked document" do
-                        person.posts(true).first.title.should eq("My Blog")
+                        expect(person.posts(true).first.title).to eq("My Blog")
                       end
                     end
                   end
@@ -3173,11 +3060,11 @@ describe Mongoid::NestedAttributes do
                     context "when reloading the document" do
 
                       it "does not delete the marked document" do
-                        person.posts(true).size.should eq(2)
+                        expect(person.posts(true).size).to eq(2)
                       end
 
                       it "does not delete the unmarked document" do
-                        person.posts(true).map(&:title).should include("My Blog")
+                        expect(person.posts(true).map(&:title)).to include("My Blog")
                       end
                     end
                   end
@@ -3212,15 +3099,15 @@ describe Mongoid::NestedAttributes do
                     context "when reloading the document" do
 
                       it "does not ignore the marked document" do
-                        person.posts(true).first.title.should eq("Another Title")
+                        expect(person.posts(true).first.title).to eq("Another Title")
                       end
 
                       it "does not delete the unmarked document" do
-                        person.posts(true).last.title.should eq("New Title")
+                        expect(person.posts(true).last.title).to eq("New Title")
                       end
 
                       it "does not add additional documents" do
-                        person.posts(true).size.should eq(2)
+                        expect(person.posts(true).size).to eq(2)
                       end
                     end
                   end
@@ -3241,11 +3128,11 @@ describe Mongoid::NestedAttributes do
                     context "when reloading the documents" do
 
                       it "does not delete the marked document" do
-                        person.posts(true).size.should eq(2)
+                        expect(person.posts(true).size).to eq(2)
                       end
 
                       it "does not delete the unmarked document" do
-                        person.posts(true).last.title.should eq("New Title")
+                        expect(person.posts(true).last.title).to eq("New Title")
                       end
                     end
                   end
@@ -3283,15 +3170,15 @@ describe Mongoid::NestedAttributes do
                     context "when reloading" do
 
                       it "does not ignore the marked document" do
-                        person.posts(true).find(post_one.id).title.should eq("Another Title")
+                        expect(person.posts(true).find(post_one.id).title).to eq("Another Title")
                       end
 
                       it "does not delete the unmarked document" do
-                        person.posts(true).find(post_two.id).title.should eq("New Title")
+                        expect(person.posts(true).find(post_two.id).title).to eq("New Title")
                       end
 
                       it "does not add additional documents" do
-                        person.posts(true).size.should eq(2)
+                        expect(person.posts(true).size).to eq(2)
                       end
                     end
                   end
@@ -3312,11 +3199,11 @@ describe Mongoid::NestedAttributes do
                     context "when reloading" do
 
                       it "does not delete the marked document" do
-                        person.posts(true).size.should eq(2)
+                        expect(person.posts(true).size).to eq(2)
                       end
 
                       it "does not delete the unmarked document" do
-                        person.posts(true).last.title.should eq("New Title")
+                        expect(person.posts(true).last.title).to eq("New Title")
                       end
                     end
                   end
@@ -3342,27 +3229,27 @@ describe Mongoid::NestedAttributes do
               end
 
               it "builds a new first document" do
-                person.posts.first.title.should eq("First")
+                expect(person.posts.first.title).to eq("First")
               end
 
               it "builds a new second document" do
-                person.posts.second.title.should eq("Second")
+                expect(person.posts.second.title).to eq("Second")
               end
 
               it "builds a new third document" do
-                person.posts.third.title.should eq("Third")
+                expect(person.posts.third.title).to eq("Third")
               end
 
               it "does not add extra documents" do
-                person.posts.size.should eq(3)
+                expect(person.posts.size).to eq(3)
               end
 
               it "does not persist the documents" do
-                person.posts.count.should eq(0)
+                expect(person.posts.count).to eq(0)
               end
 
               it "adds the documents in the sorted hash key order" do
-                person.posts.map(&:title).should eq(
+                expect(person.posts.map(&:title)).to eq(
                   [ "First", "Second", "Third" ]
                 )
               end
@@ -3383,23 +3270,23 @@ describe Mongoid::NestedAttributes do
                 end
 
                 it "builds a new first document" do
-                  person.posts.first.title.should eq("Third")
+                  expect(person.posts.first.title).to eq("Third")
                 end
 
                 it "builds a new second document" do
-                  person.posts.second.title.should eq("First")
+                  expect(person.posts.second.title).to eq("First")
                 end
 
                 it "builds a new third document" do
-                  person.posts.third.title.should eq("Second")
+                  expect(person.posts.third.title).to eq("Second")
                 end
 
                 it "does not add extra documents" do
-                  person.posts.size.should eq(3)
+                  expect(person.posts.size).to eq(3)
                 end
 
                 it "does not persist the documents" do
-                  person.posts.count.should eq(0)
+                  expect(person.posts.count).to eq(0)
                 end
               end
             end
@@ -3426,7 +3313,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "does not add the new document" do
-                person.posts.should be_empty
+                expect(person.posts).to be_empty
               end
             end
 
@@ -3438,11 +3325,11 @@ describe Mongoid::NestedAttributes do
               end
 
               it "adds the new document" do
-                person.posts.size.should eq(1)
+                expect(person.posts.size).to eq(1)
               end
 
               it "sets the correct attributes" do
-                person.posts.first.title.should eq("Blogging")
+                expect(person.posts.first.title).to eq("Blogging")
               end
             end
           end
@@ -3468,7 +3355,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "does not add the new document" do
-                person.posts.should be_empty
+                expect(person.posts).to be_empty
               end
             end
 
@@ -3480,11 +3367,11 @@ describe Mongoid::NestedAttributes do
               end
 
               it "adds the new document" do
-                person.posts.size.should eq(1)
+                expect(person.posts.size).to eq(1)
               end
 
               it "sets the correct attributes" do
-                person.posts.first.title.should eq("Blogging")
+                expect(person.posts.first.title).to eq("Blogging")
               end
             end
           end
@@ -3516,11 +3403,11 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "ignores the the marked document" do
-                    person.posts.size.should eq(1)
+                    expect(person.posts.size).to eq(1)
                   end
 
                   it "adds the new unmarked document" do
-                    person.posts.first.title.should eq("Blog Two")
+                    expect(person.posts.first.title).to eq("Blog Two")
                   end
                 end
               end
@@ -3538,15 +3425,15 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "adds the new marked document" do
-                    person.posts.first.title.should eq("New Blog")
+                    expect(person.posts.first.title).to eq("New Blog")
                   end
 
                   it "adds the new unmarked document" do
-                    person.posts.last.title.should eq("Blog Two")
+                    expect(person.posts.last.title).to eq("Blog Two")
                   end
 
                   it "does not add extra documents" do
-                    person.posts.size.should eq(2)
+                    expect(person.posts.size).to eq(2)
                   end
                 end
               end
@@ -3577,15 +3464,15 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "adds the the marked document" do
-                    person.posts.first.title.should eq("New Blog")
+                    expect(person.posts.first.title).to eq("New Blog")
                   end
 
                   it "adds the new unmarked document" do
-                    person.posts.last.title.should eq("Blog Two")
+                    expect(person.posts.last.title).to eq("Blog Two")
                   end
 
                   it "adds the correct number of documents" do
-                    person.posts.size.should eq(2)
+                    expect(person.posts.size).to eq(2)
                   end
                 end
               end
@@ -3603,15 +3490,15 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "adds the new marked document" do
-                    person.posts.first.title.should eq("New Blog")
+                    expect(person.posts.first.title).to eq("New Blog")
                   end
 
                   it "adds the new unmarked document" do
-                    person.posts.last.title.should eq("Blog Two")
+                    expect(person.posts.last.title).to eq("Blog Two")
                   end
 
                   it "does not add extra documents" do
-                    person.posts.size.should eq(2)
+                    expect(person.posts.size).to eq(2)
                   end
                 end
               end
@@ -3637,15 +3524,15 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "adds the the marked document" do
-                    person.posts.first.title.should eq("New Blog")
+                    expect(person.posts.first.title).to eq("New Blog")
                   end
 
                   it "adds the new unmarked document" do
-                    person.posts.last.title.should eq("Blog Two")
+                    expect(person.posts.last.title).to eq("Blog Two")
                   end
 
                   it "adds the correct number of documents" do
-                    person.posts.size.should eq(2)
+                    expect(person.posts.size).to eq(2)
                   end
                 end
               end
@@ -3663,15 +3550,15 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "adds the new marked document" do
-                    person.posts.first.title.should eq("New Blog")
+                    expect(person.posts.first.title).to eq("New Blog")
                   end
 
                   it "adds the new unmarked document" do
-                    person.posts.last.title.should eq("Blog Two")
+                    expect(person.posts.last.title).to eq("Blog Two")
                   end
 
                   it "does not add extra documents" do
-                    person.posts.size.should eq(2)
+                    expect(person.posts.size).to eq(2)
                   end
                 end
               end
@@ -3696,8 +3583,8 @@ describe Mongoid::NestedAttributes do
           end
 
           it "propagates invalidity to parent" do
-            person.should_not be_valid
-            person.posts.first.should_not be_valid
+            expect(person).to_not be_valid
+            expect(person.posts.first).to_not be_valid
           end
         end
 
@@ -3718,7 +3605,7 @@ describe Mongoid::NestedAttributes do
           end
 
           it "instantiates an object of the given type" do
-            shipping_container.vehicles.map(&:class).should eq([Car, Truck])
+            expect(shipping_container.vehicles.map(&:class)).to eq([Car, Truck])
           end
         end
       end
@@ -3780,7 +3667,7 @@ describe Mongoid::NestedAttributes do
             end
 
             it "sets the documents on the relation" do
-              person.preferences.size.should eq(2)
+              expect(person.preferences.size).to eq(2)
             end
           end
         end
@@ -3810,15 +3697,15 @@ describe Mongoid::NestedAttributes do
               context "when reloading the document" do
 
                 it "updates the first existing document" do
-                  person.preferences(true).first.name.should eq("First")
+                  expect(person.preferences(true).first.name).to eq("First")
                 end
 
                 it "updates the second existing document" do
-                  person.preferences(true).second.name.should eq("Second")
+                  expect(person.preferences(true).second.name).to eq("Second")
                 end
 
                 it "does not add new documents" do
-                  person.preferences(true).size.should eq(2)
+                  expect(person.preferences(true).size).to eq(2)
                 end
               end
             end
@@ -3865,11 +3752,11 @@ describe Mongoid::NestedAttributes do
                     context "when reloading the documents" do
 
                       it "deletes the marked document" do
-                        person.preferences(true).size.should eq(1)
+                        expect(person.preferences(true).size).to eq(1)
                       end
 
                       it "does not delete the unmarked document" do
-                        person.preferences(true).first.name.should eq("My Blog")
+                        expect(person.preferences(true).first.name).to eq("My Blog")
                       end
                     end
                   end
@@ -3890,11 +3777,11 @@ describe Mongoid::NestedAttributes do
                     context "when reloading the document" do
 
                       it "does not delete the marked document" do
-                        person.preferences(true).size.should eq(2)
+                        expect(person.preferences(true).size).to eq(2)
                       end
 
                       it "does not delete the unmarked document" do
-                        person.preferences(true).last.name.should eq("My Blog")
+                        expect(person.preferences(true).last.name).to eq("My Blog")
                       end
                     end
                   end
@@ -3929,15 +3816,15 @@ describe Mongoid::NestedAttributes do
                     context "when reloading the document" do
 
                       it "does not ignore the marked document" do
-                        person.preferences(true).first.name.should eq("Another Title")
+                        expect(person.preferences(true).first.name).to eq("Another Title")
                       end
 
                       it "does not delete the unmarked document" do
-                        person.preferences(true).last.name.should eq("New Title")
+                        expect(person.preferences(true).last.name).to eq("New Title")
                       end
 
                       it "does not add additional documents" do
-                        person.preferences(true).size.should eq(2)
+                        expect(person.preferences(true).size).to eq(2)
                       end
                     end
                   end
@@ -3958,11 +3845,11 @@ describe Mongoid::NestedAttributes do
                     context "when reloading the documents" do
 
                       it "does not delete the marked document" do
-                        person.preferences(true).size.should eq(2)
+                        expect(person.preferences(true).size).to eq(2)
                       end
 
                       it "does not delete the unmarked document" do
-                        person.preferences(true).last.name.should eq("New Title")
+                        expect(person.preferences(true).last.name).to eq("New Title")
                       end
                     end
                   end
@@ -3992,15 +3879,15 @@ describe Mongoid::NestedAttributes do
                     context "when reloading" do
 
                       it "does not ignore the marked document" do
-                        person.preferences(true).first.name.should eq("Another Title")
+                        expect(person.preferences(true).first.name).to eq("Another Title")
                       end
 
                       it "does not delete the unmarked document" do
-                        person.preferences(true).last.name.should eq("New Title")
+                        expect(person.preferences(true).last.name).to eq("New Title")
                       end
 
                       it "does not add additional documents" do
-                        person.preferences(true).size.should eq(2)
+                        expect(person.preferences(true).size).to eq(2)
                       end
                     end
                   end
@@ -4021,11 +3908,11 @@ describe Mongoid::NestedAttributes do
                     context "when reloading" do
 
                       it "does not delete the marked document" do
-                        person.preferences(true).size.should eq(2)
+                        expect(person.preferences(true).size).to eq(2)
                       end
 
                       it "does not delete the unmarked document" do
-                        person.preferences(true).last.name.should eq("New Title")
+                        expect(person.preferences(true).last.name).to eq("New Title")
                       end
                     end
                   end
@@ -4049,23 +3936,23 @@ describe Mongoid::NestedAttributes do
             end
 
             it "builds a new first document" do
-              person.preferences.first.name.should eq("First")
+              expect(person.preferences.first.name).to eq("First")
             end
 
             it "builds a new second document" do
-              person.preferences.second.name.should eq("Second")
+              expect(person.preferences.second.name).to eq("Second")
             end
 
             it "builds a new third document" do
-              person.preferences.third.name.should eq("Third")
+              expect(person.preferences.third.name).to eq("Third")
             end
 
             it "does not add extra documents" do
-              person.preferences.size.should eq(3)
+              expect(person.preferences.size).to eq(3)
             end
 
             it "adds the documents in the sorted hash key order" do
-              person.preferences.map(&:name).should eq(
+              expect(person.preferences.map(&:name)).to eq(
                 [ "First", "Second", "Third" ]
               )
             end
@@ -4092,7 +3979,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "does not add the new document" do
-                person.preferences.should be_empty
+                expect(person.preferences).to be_empty
               end
             end
 
@@ -4104,11 +3991,11 @@ describe Mongoid::NestedAttributes do
               end
 
               it "adds the new document" do
-                person.preferences.size.should eq(1)
+                expect(person.preferences.size).to eq(1)
               end
 
               it "sets the correct attributes" do
-                person.preferences.first.name.should eq("Blogging")
+                expect(person.preferences.first.name).to eq("Blogging")
               end
             end
           end
@@ -4134,7 +4021,7 @@ describe Mongoid::NestedAttributes do
               end
 
               it "does not add the new document" do
-                person.preferences.should be_empty
+                expect(person.preferences).to be_empty
               end
             end
 
@@ -4146,11 +4033,11 @@ describe Mongoid::NestedAttributes do
               end
 
               it "adds the new document" do
-                person.preferences.size.should eq(1)
+                expect(person.preferences.size).to eq(1)
               end
 
               it "sets the correct attributes" do
-                person.preferences.first.name.should eq("Blogging")
+                expect(person.preferences.first.name).to eq("Blogging")
               end
             end
           end
@@ -4182,11 +4069,11 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "ignores the the marked document" do
-                    person.preferences.size.should eq(1)
+                    expect(person.preferences.size).to eq(1)
                   end
 
                   it "adds the new unmarked document" do
-                    person.preferences.first.name.should eq("Blog Two")
+                    expect(person.preferences.first.name).to eq("Blog Two")
                   end
                 end
               end
@@ -4204,15 +4091,15 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "adds the new marked document" do
-                    person.preferences.first.name.should eq("New Blog")
+                    expect(person.preferences.first.name).to eq("New Blog")
                   end
 
                   it "adds the new unmarked document" do
-                    person.preferences.last.name.should eq("Blog Two")
+                    expect(person.preferences.last.name).to eq("Blog Two")
                   end
 
                   it "does not add extra documents" do
-                    person.preferences.size.should eq(2)
+                    expect(person.preferences.size).to eq(2)
                   end
                 end
               end
@@ -4243,15 +4130,15 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "adds the the marked document" do
-                    person.preferences.first.name.should eq("New Blog")
+                    expect(person.preferences.first.name).to eq("New Blog")
                   end
 
                   it "adds the new unmarked document" do
-                    person.preferences.last.name.should eq("Blog Two")
+                    expect(person.preferences.last.name).to eq("Blog Two")
                   end
 
                   it "adds the correct number of documents" do
-                    person.preferences.size.should eq(2)
+                    expect(person.preferences.size).to eq(2)
                   end
                 end
               end
@@ -4269,15 +4156,15 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "adds the new marked document" do
-                    person.preferences.first.name.should eq("New Blog")
+                    expect(person.preferences.first.name).to eq("New Blog")
                   end
 
                   it "adds the new unmarked document" do
-                    person.preferences.last.name.should eq("Blog Two")
+                    expect(person.preferences.last.name).to eq("Blog Two")
                   end
 
                   it "does not add extra documents" do
-                    person.preferences.size.should eq(2)
+                    expect(person.preferences.size).to eq(2)
                   end
                 end
               end
@@ -4303,15 +4190,15 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "adds the the marked document" do
-                    person.preferences.first.name.should eq("New Blog")
+                    expect(person.preferences.first.name).to eq("New Blog")
                   end
 
                   it "adds the new unmarked document" do
-                    person.preferences.last.name.should eq("Blog Two")
+                    expect(person.preferences.last.name).to eq("Blog Two")
                   end
 
                   it "adds the correct number of documents" do
-                    person.preferences.size.should eq(2)
+                    expect(person.preferences.size).to eq(2)
                   end
                 end
               end
@@ -4329,15 +4216,15 @@ describe Mongoid::NestedAttributes do
                   end
 
                   it "adds the new marked document" do
-                    person.preferences.first.name.should eq("New Blog")
+                    expect(person.preferences.first.name).to eq("New Blog")
                   end
 
                   it "adds the new unmarked document" do
-                    person.preferences.last.name.should eq("Blog Two")
+                    expect(person.preferences.last.name).to eq("Blog Two")
                   end
 
                   it "does not add extra documents" do
-                    person.preferences.size.should eq(2)
+                    expect(person.preferences.size).to eq(2)
                   end
                 end
               end
@@ -4362,8 +4249,8 @@ describe Mongoid::NestedAttributes do
           end
 
           it "propagates invalidity to parent" do
-            person.preferences.first.should_not be_valid
-            person.should_not be_valid
+            expect(person.preferences.first).to_not be_valid
+            expect(person).to_not be_valid
           end
         end
       end
@@ -4407,11 +4294,11 @@ describe Mongoid::NestedAttributes do
         end
 
         it "adds the new embedded document" do
-          server.reload.filesystems.first.name.should eq("NFS")
+          expect(server.reload.filesystems.first.name).to eq("NFS")
         end
 
         it "does not add more than one document" do
-          server.reload.filesystems.count.should eq(1)
+          expect(server.reload.filesystems.count).to eq(1)
         end
       end
     end
@@ -4439,23 +4326,23 @@ describe Mongoid::NestedAttributes do
       end
 
       it "removes the document from the parent" do
-        person.services.should be_empty
+        expect(person.services).to be_empty
       end
 
       it "deletes the document" do
-        service.should be_destroyed
+        expect(service).to be_destroyed
       end
 
       it "runs the before destroy callbacks" do
-        service.before_destroy_called.should be_true
+        expect(service.before_destroy_called).to be true
       end
 
       it "runs the after destroy callbacks" do
-        service.after_destroy_called.should be_true
+        expect(service.after_destroy_called).to be true
       end
 
       it "clears the delayed atomic pulls from the parent" do
-        person.delayed_atomic_pulls.should be_empty
+        expect(person.delayed_atomic_pulls).to be_empty
       end
     end
 
@@ -4494,12 +4381,12 @@ describe Mongoid::NestedAttributes do
       end
 
       before do
-        address.with(safe: true).update_attributes(attributes)
+        address.update_attributes(attributes)
         address.reload
       end
 
       it "does not add any extra locations" do
-        address.locations.size.should eq(2)
+        expect(address.locations.size).to eq(2)
       end
     end
 
@@ -4541,11 +4428,11 @@ describe Mongoid::NestedAttributes do
           end
 
           it "deletes the document from the relation" do
-            address_one.locations.should be_empty
+            expect(address_one.locations).to be_empty
           end
 
           it "persists the change" do
-            address_one.reload.locations.should be_empty
+            expect(address_one.reload.locations).to be_empty
           end
         end
 
@@ -4591,15 +4478,15 @@ describe Mongoid::NestedAttributes do
             end
 
             it "removes the child from the relation" do
-              record.tracks.should be_empty
+              expect(record.tracks).to be_empty
             end
 
             it "deletes the child document" do
-              track.should be_destroyed
+              expect(track).to be_destroyed
             end
 
             it "runs the child's callbacks" do
-              track.before_destroy_called.should be_true
+              expect(track.before_destroy_called).to be true
             end
           end
         end
@@ -4620,7 +4507,7 @@ describe Mongoid::NestedAttributes do
             end
 
             before do
-              person.with(safe: true).update_attributes(attributes)
+              person.update_attributes(attributes)
             end
 
             let(:address) do
@@ -4632,11 +4519,11 @@ describe Mongoid::NestedAttributes do
             end
 
             it "adds the new first level embedded document" do
-              address.street.should eq("Alexanderstr")
+              expect(address.street).to eq("Alexanderstr")
             end
 
             it "adds the nested embedded document" do
-              location.name.should eq("Home")
+              expect(location.name).to eq("Home")
             end
           end
 
@@ -4660,16 +4547,16 @@ describe Mongoid::NestedAttributes do
             end
 
             before do
-              person.with(safe: true).update_attributes(attributes)
+              person.update_attributes(attributes)
               person.reload
             end
 
             it "adds the new location to the existing address" do
-              person.addresses.first.locations.count.should eq(2)
+              expect(person.addresses.first.locations.count).to eq(2)
             end
 
             it "adds the new address" do
-              person.addresses.count.should eq(2)
+              expect(person.addresses.count).to eq(2)
             end
           end
         end
@@ -4691,7 +4578,7 @@ describe Mongoid::NestedAttributes do
           end
 
           before do
-            person.with(safe: true).update_attributes(attributes)
+            person.update_attributes(attributes)
           end
 
           let(:address) do
@@ -4703,11 +4590,11 @@ describe Mongoid::NestedAttributes do
           end
 
           it "adds the new first level embedded document" do
-            address.street.should eq("Alexanderstr")
+            expect(address.street).to eq("Alexanderstr")
           end
 
           it "adds the nested embedded document" do
-            code.name.should eq("Home")
+            expect(code.name).to eq("Home")
           end
         end
       end
@@ -4740,15 +4627,15 @@ describe Mongoid::NestedAttributes do
           end
 
           before do
-            person.with(safe: true).update_attributes(attributes)
+            person.update_attributes(attributes)
           end
 
           it "updates the first level embedded document" do
-            address.number.should eq(45)
+            expect(address.number).to eq(45)
           end
 
           it "updates the nested embedded document" do
-            code.name.should eq("Work")
+            expect(code.name).to eq("Work")
           end
         end
 
@@ -4780,15 +4667,15 @@ describe Mongoid::NestedAttributes do
             end
 
             before do
-              person.with(safe: true).update_attributes(attributes)
+              person.update_attributes(attributes)
             end
 
             it "updates the first level embedded document" do
-              address.number.should eq(45)
+              expect(address.number).to eq(45)
             end
 
             it "updates the nested embedded document" do
-              target.name.should eq("updated")
+              expect(target.name).to eq("updated")
             end
           end
 
@@ -4816,11 +4703,11 @@ describe Mongoid::NestedAttributes do
               end
 
               before do
-                person.with(safe: true).update_attributes(attributes)
+                person.update_attributes(attributes)
               end
 
               it "updates the nested embedded document" do
-                language.name.should eq("deutsch")
+                expect(language.name).to eq("deutsch")
               end
             end
           end
@@ -4851,11 +4738,11 @@ describe Mongoid::NestedAttributes do
         end
 
         it "adds the new document to the relation" do
-          post.title.should eq("Testing")
+          expect(post.title).to eq("Testing")
         end
 
         it "autosaves the relation" do
-          user.posts(true).first.title.should eq("Testing")
+          expect(user.posts(true).first.title).to eq("Testing")
         end
       end
 
@@ -4882,15 +4769,15 @@ describe Mongoid::NestedAttributes do
           end
 
           it "returns false" do
-            update.should be_false
+            expect(update).to be false
           end
 
           it "does not update the child document" do
-            server.reload.name.should eq("test")
+            expect(server.reload.name).to eq("test")
           end
 
           it "adds the errors to the document" do
-            node.errors[:servers].should_not be_nil
+            expect(node.errors[:servers]).to_not be_nil
           end
         end
       end
@@ -4917,7 +4804,7 @@ describe Mongoid::NestedAttributes do
       end
 
       it "sets the nested attributes" do
-        league.reload.divisions.first.name.should eq("New Name")
+        expect(league.reload.divisions.first.name).to eq("New Name")
       end
 
       context "with corrupted data" do
@@ -4937,7 +4824,7 @@ describe Mongoid::NestedAttributes do
         end
 
         it "sets the nested attributes" do
-          league.reload.divisions.first.name.should eq("Name")
+          expect(league.reload.divisions.first.name).to eq("Name")
         end
       end
     end