mongoid 3.1.6 → 4.0.2

data/spec/mongoid/atomic/paths_spec.rb

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

data/spec/mongoid/atomic_spec.rb

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

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
 
@@ -55,7 +55,7 @@ describe Mongoid::NestedAttributes do
 
     context "when the relation is an embeds one" do
 
-      before(:all) do
+      before do
         Person.send(:undef_method, :name_attributes=)
         Person.accepts_nested_attributes_for :name
       end
@@ -65,13 +65,13 @@ 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
 
     context "when the relation is an embeds many" do
 
-      before(:all) do
+      before do
         Person.send(:undef_method, :addresses_attributes=)
         Person.accepts_nested_attributes_for :addresses
       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,14 +97,14 @@ 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
 
     context "when the relation is an embedded in" do
 
-      before(:all) do
+      before do
         Video.accepts_nested_attributes_for :person
       end
 
@@ -113,13 +113,13 @@ 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
 
     context "when the relation is a references one" do
 
-      before(:all) do
+      before do
         Person.send(:undef_method, :game_attributes=)
         Person.accepts_nested_attributes_for :game
       end
@@ -129,13 +129,13 @@ 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
 
     context "when the relation is a references many" do
 
-      before(:all) do
+      before do
         Person.send(:undef_method, :posts_attributes=)
         Person.accepts_nested_attributes_for :posts
       end
@@ -145,13 +145,13 @@ 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
 
     context "when the relation is a references and referenced in many" do
 
-      before(:all) do
+      before do
         Person.send(:undef_method, :preferences_attributes=)
         Person.accepts_nested_attributes_for :preferences
       end
@@ -161,13 +161,13 @@ 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
 
     context "when the relation is a referenced in" do
 
-      before(:all) do
+      before do
         Post.accepts_nested_attributes_for :person
       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
@@ -237,13 +237,13 @@ describe Mongoid::NestedAttributes do
 
         context "when a reject proc is specified" do
 
-          before(:all) do
+          before do
             Person.send(:undef_method, :name_attributes=)
             Person.accepts_nested_attributes_for \
               :name, reject_if: ->(attrs){ attrs[:first_name].blank? }
           end
 
-          after(:all) do
+          after do
             Person.send(:undef_method, :name_attributes=)
             Person.accepts_nested_attributes_for :name
           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
@@ -275,13 +275,13 @@ describe Mongoid::NestedAttributes do
 
           context "when the relation is not autobuilding" do
 
-            before(:all) do
+            before do
               Person.send(:undef_method, :name_attributes=)
               Person.accepts_nested_attributes_for \
                 :name, reject_if: :all_blank
             end
 
-            after(:all) do
+            after do
               Person.send(:undef_method, :name_attributes=)
               Person.accepts_nested_attributes_for :name
             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,18 +304,18 @@ 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
 
           context "when the relation is autobuilding" do
 
-            before(:all) do
+            before do
               Product.accepts_nested_attributes_for :seo, reject_if: :all_blank
             end
 
-            after(:all) do
+            after do
               Product.send(:undef_method, :seo_attributes=)
             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
 
@@ -349,12 +349,12 @@ describe Mongoid::NestedAttributes do
 
             context "when allow_destroy is true" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :name_attributes=)
                 Person.accepts_nested_attributes_for :name, allow_destroy: true
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :name_attributes=)
                 Person.accepts_nested_attributes_for :name
               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,19 +377,19 @@ 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
 
             context "when allow_destroy is false" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :name_attributes=)
                 Person.accepts_nested_attributes_for :name, allow_destroy: false
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :name_attributes=)
                 Person.accepts_nested_attributes_for :name
               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
 
@@ -433,12 +433,12 @@ describe Mongoid::NestedAttributes do
 
               context "when allow_destroy is true" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name
                 end
@@ -449,18 +449,18 @@ 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
 
               context "when allow_destroy is false" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name
                 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,18 +512,18 @@ 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
 
               context "when allow_destroy is true" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name
                 end
@@ -540,17 +540,17 @@ describe Mongoid::NestedAttributes do
                       end
 
                       it "destroys the existing document" do
-                        person.name.should be_nil
+                        expect(person.name).to be_nil
                       end
                     end
 
                     context "when the document has destroy callbacks" do
 
-                      before(:all) do
+                      before do
                         PetOwner.accepts_nested_attributes_for :pet, allow_destroy: true
                       end
 
-                      after(:all) do
+                      after do
                         PetOwner.send(:undef_method, :pet_attributes=)
                       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
@@ -596,12 +596,12 @@ describe Mongoid::NestedAttributes do
 
               context "when allow destroy is false" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name
                 end
@@ -614,14 +614,14 @@ 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
 
               context "when update only is true" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for \
                     :name,
@@ -629,7 +629,7 @@ describe Mongoid::NestedAttributes do
                     allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :name_attributes=)
                   Person.accepts_nested_attributes_for :name
                 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
@@ -693,11 +693,11 @@ describe Mongoid::NestedAttributes do
 
         context "when the nested document is invalid" do
 
-          before(:all) do
+          before do
             Person.validates_associated(:pet)
           end
 
-          after(:all) do
+          after do
             Person.reset_callbacks(:validate)
           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
@@ -755,12 +755,12 @@ describe Mongoid::NestedAttributes do
 
               context "when allow_destroy is true" do
 
-                before(:all) do
+                before do
                   Animal.send(:undef_method, :person_attributes=)
                   Animal.accepts_nested_attributes_for :person, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Animal.send(:undef_method, :person_attributes=)
                   Animal.accepts_nested_attributes_for :person
                 end
@@ -770,18 +770,18 @@ 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
 
               context "when allow_destroy is false" do
 
-                before(:all) do
+                before do
                   Animal.send(:undef_method, :person_attributes=)
                   Animal.accepts_nested_attributes_for :person, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Animal.send(:undef_method, :person_attributes=)
                   Animal.accepts_nested_attributes_for :person
                 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
@@ -825,12 +825,12 @@ describe Mongoid::NestedAttributes do
 
               context "when allow destroy is true" do
 
-                before(:all) do
+                before do
                   Animal.send(:undef_method, :person_attributes=)
                   Animal.accepts_nested_attributes_for :person, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Animal.send(:undef_method, :person_attributes=)
                   Animal.accepts_nested_attributes_for :person
                 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
@@ -868,12 +868,12 @@ describe Mongoid::NestedAttributes do
 
               context "when allow destroy is false" do
 
-                before(:all) do
+                before do
                   Animal.send(:undef_method, :person_attributes=)
                   Animal.accepts_nested_attributes_for :person, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Animal.send(:undef_method, :person_attributes=)
                   Animal.accepts_nested_attributes_for :person
                 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
@@ -942,11 +942,11 @@ describe Mongoid::NestedAttributes do
 
           context "when the nested document is invalid" do
 
-            before(:all) do
+            before do
               Person.validates_format_of :ssn, without: /\$\$\$/
             end
 
-            after(:all) do
+            after do
               Person.reset_callbacks(:validate)
             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,22 +1039,14 @@ 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
+          before do
             Person.send(:undef_method, :addresses_attributes=)
             Person.accepts_nested_attributes_for :addresses, limit: 2
           end
 
-          after(:all) do
+          after do
             Person.send(:undef_method, :addresses_attributes=)
             Person.accepts_nested_attributes_for :addresses
           end
@@ -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,17 +1100,17 @@ 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
 
           context "when cascading callbacks" do
 
-            before(:all) do
+            before do
               Band.accepts_nested_attributes_for :records
             end
 
-            after(:all) do
+            after do
               Band.send(:undef_method, :records_attributes=)
             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
 
@@ -1322,18 +1314,13 @@ describe Mongoid::NestedAttributes do
 
                 context "when the parent validation failed" do
 
-                  before(:all) do
-                    Band.validates_presence_of :name
-                    Band.accepts_nested_attributes_for :records, :allow_destroy => true
-                  end
-
-                  after(:all) do
-                    Band.send(:undef_method, :records_attributes=)
-                    Band.reset_callbacks(:validate)
+                  class BandWithAllowDestroyedRecords < Band
+                    validates_presence_of :name
+                    accepts_nested_attributes_for :records, :allow_destroy => true
                   end
 
                   let!(:band) do
-                    Band.create(name: "Depeche Mode")
+                    BandWithAllowDestroyedRecords.create(name: "Depeche Mode")
                   end
 
                   let!(:record) do
@@ -1352,25 +1339,25 @@ 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
 
                 context "when the child accesses the parent after destroy" do
 
-                  before(:all) do
+                  before do
                     Band.accepts_nested_attributes_for :records, :allow_destroy => true
                   end
 
-                  after(:all) do
+                  after do
                     Band.send(:undef_method, :records_attributes=)
                   end
 
@@ -1389,21 +1376,21 @@ 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
 
                 context "when the child has defaults" do
 
-                  before(:all) do
+                  before do
                     Person.accepts_nested_attributes_for :appointments, allow_destroy: true
                   end
 
-                  after(:all) do
+                  after do
                     Person.send(:undef_method, :appointments_attributes=)
                   end
 
@@ -1415,31 +1402,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 +1419,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 +1452,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
@@ -1503,12 +1465,12 @@ describe Mongoid::NestedAttributes do
 
                 context "when the child is not paranoid" do
 
-                  before(:all) do
+                  before do
                     Person.send(:undef_method, :addresses_attributes=)
                     Person.accepts_nested_attributes_for :addresses, allow_destroy: true
                   end
 
-                  after(:all) do
+                  after do
                     Person.send(:undef_method, :addresses_attributes=)
                     Person.accepts_nested_attributes_for :addresses
                   end
@@ -1530,11 +1492,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 +1511,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 +1540,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 +1602,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 +1657,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
@@ -1788,12 +1670,12 @@ describe Mongoid::NestedAttributes do
 
               context "when allow_destroy is false" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :addresses_attributes=)
                   Person.accepts_nested_attributes_for :addresses, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :addresses_attributes=)
                   Person.accepts_nested_attributes_for :addresses
                 end
@@ -1812,15 +1694,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 +1720,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
@@ -1850,7 +1732,7 @@ describe Mongoid::NestedAttributes do
 
               context "when allow_destroy is undefined" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :addresses_attributes=)
                   Person.accepts_nested_attributes_for :addresses
                 end
@@ -1869,15 +1751,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 +1777,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 +1804,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
@@ -1946,13 +1828,13 @@ describe Mongoid::NestedAttributes do
 
           context "when a reject block is supplied" do
 
-            before(:all) do
+            before do
               Person.send(:undef_method, :addresses_attributes=)
               Person.accepts_nested_attributes_for \
                 :addresses, reject_if: ->(attrs){ attrs["street"].blank? }
             end
 
-            after(:all) do
+            after do
               Person.send(:undef_method, :addresses_attributes=)
               Person.accepts_nested_attributes_for :addresses
             end
@@ -1965,7 +1847,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,24 +1859,24 @@ 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
 
           context "when :reject_if => :all_blank is supplied" do
 
-            before(:all) do
+            before do
               Person.send(:undef_method, :addresses_attributes=)
               Person.accepts_nested_attributes_for \
                 :addresses, reject_if: :all_blank
             end
 
-            after(:all) do
+            after do
               Person.send(:undef_method, :addresses_attributes=)
               Person.accepts_nested_attributes_for :addresses
             end
@@ -2007,7 +1889,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 +1901,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
@@ -2032,12 +1914,12 @@ describe Mongoid::NestedAttributes do
 
             context "when allow_destroy is true" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :addresses_attributes=)
                 Person.accepts_nested_attributes_for :addresses, allow_destroy: true
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :addresses_attributes=)
                 Person.accepts_nested_attributes_for :addresses
               end
@@ -2055,11 +1937,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 +1959,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
@@ -2093,12 +1975,12 @@ describe Mongoid::NestedAttributes do
 
             context "when allow destroy is false" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :addresses_attributes=)
                 Person.accepts_nested_attributes_for :addresses, allow_destroy: false
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :addresses_attributes=)
                 Person.accepts_nested_attributes_for :addresses
               end
@@ -2116,15 +1998,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 +2024,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
@@ -2158,7 +2040,7 @@ describe Mongoid::NestedAttributes do
 
             context "when allow destroy is not defined" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :addresses_attributes=)
                 Person.accepts_nested_attributes_for :addresses
               end
@@ -2176,15 +2058,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 +2084,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
@@ -2219,13 +2101,13 @@ describe Mongoid::NestedAttributes do
 
           context "when 'reject_if: :all_blank' and 'allow_destroy: true' are specified" do
 
-            before(:all) do
+            before do
               Person.send(:undef_method, :addresses_attributes=)
               Person.accepts_nested_attributes_for \
                 :addresses, reject_if: :all_blank, allow_destroy: true
             end
 
-            after(:all) do
+            after do
               Person.send(:undef_method, :addresses_attributes=)
               Person.accepts_nested_attributes_for :addresses
             end
@@ -2238,7 +2120,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
@@ -2246,11 +2128,11 @@ describe Mongoid::NestedAttributes do
 
         context "when the nested document is invalid" do
 
-          before(:all) do
+          before do
             Person.validates_associated(:addresses)
           end
 
-          after(:all) do
+          after do
             Person.reset_callbacks(:validate)
           end
 
@@ -2261,8 +2143,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 +2165,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
@@ -2296,13 +2178,13 @@ describe Mongoid::NestedAttributes do
 
         context "when a reject proc is specified" do
 
-          before(:all) do
+          before do
             Person.send(:undef_method, :game_attributes=)
             Person.accepts_nested_attributes_for \
               :game, reject_if: ->(attrs){ attrs[:name].blank? }
           end
 
-          after(:all) do
+          after do
             Person.send(:undef_method, :game_attributes=)
             Person.accepts_nested_attributes_for :game
           end
@@ -2314,7 +2196,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,20 +2207,20 @@ 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
 
         context "when reject_if => :all_blank is specified" do
 
-          before(:all) do
+          before do
             Person.send(:undef_method, :game_attributes=)
             Person.accepts_nested_attributes_for \
               :game, reject_if: :all_blank
           end
 
-          after(:all) do
+          after do
             Person.send(:undef_method, :game_attributes=)
             Person.accepts_nested_attributes_for :game
           end
@@ -2350,7 +2232,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 +2243,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 +2257,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
 
@@ -2383,12 +2265,12 @@ describe Mongoid::NestedAttributes do
 
             context "when allow_destroy is true" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :game_attributes=)
                 Person.accepts_nested_attributes_for :game, allow_destroy: true
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :game_attributes=)
                 Person.accepts_nested_attributes_for :game
               end
@@ -2398,18 +2280,18 @@ 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
 
             context "when allow_destroy is false" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :game_attributes=)
                 Person.accepts_nested_attributes_for :game, allow_destroy: false
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :game_attributes=)
                 Person.accepts_nested_attributes_for :game
               end
@@ -2419,7 +2301,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 +2313,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 +2327,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 +2343,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
 
@@ -2469,12 +2351,12 @@ describe Mongoid::NestedAttributes do
 
               context "when allow_destroy is true" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game
                 end
@@ -2485,18 +2367,18 @@ 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
 
               context "when allow_destroy is false" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game
                 end
@@ -2507,7 +2389,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 +2418,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,18 +2430,18 @@ 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
 
               context "when allow_destroy is true" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game
                 end
@@ -2574,7 +2456,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 +2471,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
@@ -2597,12 +2479,12 @@ describe Mongoid::NestedAttributes do
 
               context "when allow destroy is false" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game
                 end
@@ -2615,14 +2497,14 @@ 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
 
               context "when update only is true" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for \
                     :game,
@@ -2630,7 +2512,7 @@ describe Mongoid::NestedAttributes do
                     allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :game_attributes=)
                   Person.accepts_nested_attributes_for :game
                 end
@@ -2643,7 +2525,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 +2533,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 +2549,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
@@ -2677,11 +2559,11 @@ describe Mongoid::NestedAttributes do
 
         context "when the nested document is invalid" do
 
-          before(:all) do
+          before do
             Person.validates_associated(:game)
           end
 
-          after(:all) do
+          after do
             Person.reset_callbacks(:validate)
           end
 
@@ -2690,8 +2572,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 +2590,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 +2612,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
@@ -2739,12 +2621,12 @@ describe Mongoid::NestedAttributes do
 
               context "when allow_destroy is true" do
 
-                before(:all) do
+                before do
                   Game.send(:undef_method, :person_attributes=)
                   Game.accepts_nested_attributes_for :person, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Game.send(:undef_method, :person_attributes=)
                   Game.accepts_nested_attributes_for :person
                 end
@@ -2754,18 +2636,18 @@ 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
 
               context "when allow_destroy is false" do
 
-                before(:all) do
+                before do
                   Game.send(:undef_method, :person_attributes=)
                   Game.accepts_nested_attributes_for :person, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Game.send(:undef_method, :person_attributes=)
                   Game.accepts_nested_attributes_for :person
                 end
@@ -2775,7 +2657,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 +2678,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
@@ -2809,12 +2691,12 @@ describe Mongoid::NestedAttributes do
 
               context "when allow destroy is true" do
 
-                before(:all) do
+                before do
                   Game.send(:undef_method, :person_attributes=)
                   Game.accepts_nested_attributes_for :person, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Game.send(:undef_method, :person_attributes=)
                   Game.accepts_nested_attributes_for :person
                 end
@@ -2829,7 +2711,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 +2726,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
@@ -2852,12 +2734,12 @@ describe Mongoid::NestedAttributes do
 
               context "when allow destroy is false" do
 
-                before(:all) do
+                before do
                   Game.send(:undef_method, :person_attributes=)
                   Game.accepts_nested_attributes_for :person, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Game.send(:undef_method, :person_attributes=)
                   Game.accepts_nested_attributes_for :person
                 end
@@ -2870,7 +2752,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 +2775,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 +2783,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 +2799,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
@@ -2926,11 +2808,11 @@ describe Mongoid::NestedAttributes do
 
           context "when the nested document is invalid" do
 
-            before(:all) do
+            before do
               Person.validates_format_of :ssn, without: /\$\$\$/
             end
 
-            after(:all) do
+            after do
               Person.reset_callbacks(:validate)
             end
 
@@ -2939,8 +2821,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 +2840,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
@@ -2979,12 +2861,12 @@ describe Mongoid::NestedAttributes do
 
         context "when a limit is specified" do
 
-          before(:all) do
+          before do
             Person.send(:undef_method, :posts_attributes=)
             Person.accepts_nested_attributes_for :posts, limit: 2
           end
 
-          after(:all) do
+          after do
             Person.send(:undef_method, :posts_attributes=)
             Person.accepts_nested_attributes_for :posts
           end
@@ -3020,11 +2902,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 +2936,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 +2958,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 +2983,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 +3030,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 +3055,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 +3094,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 +3123,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
@@ -3254,12 +3136,12 @@ describe Mongoid::NestedAttributes do
 
               context "when allow_destroy is undefined" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :posts_attributes=)
                   Person.accepts_nested_attributes_for :posts
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :posts_attributes=)
                   Person.accepts_nested_attributes_for :posts
                 end
@@ -3283,15 +3165,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 +3194,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 +3224,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 +3265,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
@@ -3407,13 +3289,13 @@ describe Mongoid::NestedAttributes do
 
           context "when a reject block is supplied" do
 
-            before(:all) do
+            before do
               Person.send(:undef_method, :posts_attributes=)
               Person.accepts_nested_attributes_for \
                 :posts, reject_if: ->(attrs){ attrs["title"].blank? }
             end
 
-            after(:all) do
+            after do
               Person.send(:undef_method, :posts_attributes=)
               Person.accepts_nested_attributes_for :posts
             end
@@ -3426,7 +3308,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,24 +3320,24 @@ 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
 
           context "when :reject_if => :all_blank is supplied" do
 
-            before(:all) do
+            before do
               Person.send(:undef_method, :posts_attributes=)
               Person.accepts_nested_attributes_for \
                 :posts, reject_if: :all_blank
             end
 
-            after(:all) do
+            after do
               Person.send(:undef_method, :posts_attributes=)
               Person.accepts_nested_attributes_for :posts
             end
@@ -3468,7 +3350,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 +3362,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
@@ -3493,12 +3375,12 @@ describe Mongoid::NestedAttributes do
 
             context "when allow_destroy is true" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :posts_attributes=)
                 Person.accepts_nested_attributes_for :posts, allow_destroy: true
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :posts_attributes=)
                 Person.accepts_nested_attributes_for :posts
               end
@@ -3516,11 +3398,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 +3420,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
@@ -3554,12 +3436,12 @@ describe Mongoid::NestedAttributes do
 
             context "when allow destroy is false" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :posts_attributes=)
                 Person.accepts_nested_attributes_for :posts, allow_destroy: false
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :posts_attributes=)
                 Person.accepts_nested_attributes_for :posts
               end
@@ -3577,15 +3459,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 +3485,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
@@ -3619,7 +3501,7 @@ describe Mongoid::NestedAttributes do
 
             context "when allow destroy is not defined" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :posts_attributes=)
                 Person.accepts_nested_attributes_for :posts
               end
@@ -3637,15 +3519,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 +3545,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
@@ -3681,11 +3563,11 @@ describe Mongoid::NestedAttributes do
 
         context "when the nested document is invalid" do
 
-          before(:all) do
+          before do
             Person.validates_associated(:posts)
           end
 
-          after(:all) do
+          after do
             Person.reset_callbacks(:validate)
           end
 
@@ -3696,8 +3578,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 +3600,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
@@ -3739,12 +3621,12 @@ describe Mongoid::NestedAttributes do
 
         context "when a limit is specified" do
 
-          before(:all) do
+          before do
             Person.send(:undef_method, :preferences_attributes=)
             Person.accepts_nested_attributes_for :preferences, limit: 2
           end
 
-          after(:all) do
+          after do
             Person.send(:undef_method, :preferences_attributes=)
             Person.accepts_nested_attributes_for :preferences
           end
@@ -3780,7 +3662,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 +3692,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
@@ -3840,12 +3722,12 @@ describe Mongoid::NestedAttributes do
 
               context "when allow_destroy is true" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :preferences_attributes=)
                   Person.accepts_nested_attributes_for :preferences, allow_destroy: true
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :preferences_attributes=)
                   Person.accepts_nested_attributes_for :preferences
                 end
@@ -3865,11 +3747,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 +3772,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
@@ -3903,12 +3785,12 @@ describe Mongoid::NestedAttributes do
 
               context "when allow_destroy is false" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :preferences_attributes=)
                   Person.accepts_nested_attributes_for :preferences, allow_destroy: false
                 end
 
-                after(:all) do
+                after do
                   Person.send(:undef_method, :preferences_attributes=)
                   Person.accepts_nested_attributes_for :preferences
                 end
@@ -3929,15 +3811,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 +3840,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
@@ -3971,7 +3853,7 @@ describe Mongoid::NestedAttributes do
 
               context "when allow_destroy is undefined" do
 
-                before(:all) do
+                before do
                   Person.send(:undef_method, :preferences_attributes=)
                   Person.accepts_nested_attributes_for :preferences
                 end
@@ -3992,15 +3874,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 +3903,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 +3931,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
@@ -4073,13 +3955,13 @@ describe Mongoid::NestedAttributes do
 
           context "when a reject block is supplied" do
 
-            before(:all) do
+            before do
               Person.send(:undef_method, :preferences_attributes=)
               Person.accepts_nested_attributes_for \
                 :preferences, reject_if: ->(attrs){ attrs["name"].blank? }
             end
 
-            after(:all) do
+            after do
               Person.send(:undef_method, :preferences_attributes=)
               Person.accepts_nested_attributes_for :preferences
             end
@@ -4092,7 +3974,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,24 +3986,24 @@ 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
 
           context "when :reject_if => :all_blank is supplied" do
 
-            before(:all) do
+            before do
               Person.send(:undef_method, :preferences_attributes=)
               Person.accepts_nested_attributes_for \
                 :preferences, reject_if: :all_blank
             end
 
-            after(:all) do
+            after do
               Person.send(:undef_method, :preferences_attributes=)
               Person.accepts_nested_attributes_for :preferences
             end
@@ -4134,7 +4016,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 +4028,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
@@ -4159,12 +4041,12 @@ describe Mongoid::NestedAttributes do
 
             context "when allow_destroy is true" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :preferences_attributes=)
                 Person.accepts_nested_attributes_for :preferences, allow_destroy: true
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :preferences_attributes=)
                 Person.accepts_nested_attributes_for :preferences
               end
@@ -4182,11 +4064,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 +4086,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
@@ -4220,12 +4102,12 @@ describe Mongoid::NestedAttributes do
 
             context "when allow destroy is false" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :preferences_attributes=)
                 Person.accepts_nested_attributes_for :preferences, allow_destroy: false
               end
 
-              after(:all) do
+              after do
                 Person.send(:undef_method, :preferences_attributes=)
                 Person.accepts_nested_attributes_for :preferences
               end
@@ -4243,15 +4125,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 +4151,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
@@ -4285,7 +4167,7 @@ describe Mongoid::NestedAttributes do
 
             context "when allow destroy is not defined" do
 
-              before(:all) do
+              before do
                 Person.send(:undef_method, :preferences_attributes=)
                 Person.accepts_nested_attributes_for :preferences
               end
@@ -4303,15 +4185,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 +4211,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
@@ -4347,11 +4229,11 @@ describe Mongoid::NestedAttributes do
 
         context "when the nested document is invalid" do
 
-          before(:all) do
+          before do
             Person.validates_associated(:preferences)
           end
 
-          after(:all) do
+          after do
             Person.reset_callbacks(:validate)
           end
 
@@ -4362,8 +4244,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
@@ -4372,7 +4254,7 @@ describe Mongoid::NestedAttributes do
 
   describe "#update_attributes" do
 
-    before(:all) do
+    before do
       Person.send(:undef_method, :addresses_attributes=)
       Person.accepts_nested_attributes_for :addresses
     end
@@ -4407,11 +4289,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,29 +4321,29 @@ 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
 
     context "when nesting multiple levels and parent is timestamped" do
 
-      before(:all) do
+      before do
         class Address
           after_save do
             addressable.touch
@@ -4469,7 +4351,7 @@ describe Mongoid::NestedAttributes do
         end
       end
 
-      after(:all) do
+      after do
         Address.reset_callbacks(:save)
       end
 
@@ -4494,12 +4376,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 +4423,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
 
@@ -4565,12 +4447,12 @@ describe Mongoid::NestedAttributes do
 
           context "when cascading callbacks" do
 
-            before(:all) do
+            before do
               Band.accepts_nested_attributes_for :records
               Record.accepts_nested_attributes_for :tracks, allow_destroy: true
             end
 
-            after(:all) do
+            after do
               Band.send(:undef_method, :records_attributes=)
               Record.send(:undef_method, :tracks_attributes=)
             end
@@ -4591,15 +4473,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 +4502,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 +4514,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 +4542,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 +4573,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 +4585,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 +4622,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 +4662,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 +4698,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 +4733,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 +4764,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 +4799,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 +4819,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