mongoid 7.0.2 → 8.1.1

data/spec/mongoid/association/referenced/has_many/proxy_spec.rb

@@ -1,10 +1,31 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
+module RefHasManySpec
+  module OverrideInitialize
+    class Parent
+      include Mongoid::Document
+      has_many :children, inverse_of: :parent
+    end
+
+    class Child
+      include Mongoid::Document
+      belongs_to :parent
+      field :name, type: String
+
+      def initialize(*args)
+        super
+        self.name ||= "default"
+      end
+    end
+  end
+end
+
 describe Mongoid::Association::Referenced::HasMany::Proxy do
+  config_override :raise_not_found_error, true
 
   before :all do
-    Mongoid.raise_not_found_error = true
-
     Drug.belongs_to :person, primary_key: :username
     Person.has_many :drugs, validate: false, primary_key: :username
   end
@@ -18,26 +39,26 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
 
     describe "##{method}" do
 
-      context "when providing the base class in child contructor" do
+      context "when providing the base class in child constructor" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let!(:post) do
           person.posts.send(method, Post.new(person: person))
         end
 
-        it "only adds the relation once" do
+        it "only adds the association once" do
           expect(person.posts.size).to eq(1)
         end
 
-        it "only persists the relation once" do
+        it "only persists the association once" do
           expect(person.reload.posts.size).to eq(1)
         end
       end
 
-      context "when the relations are not polymorphic" do
+      context "when the associations are not polymorphic" do
 
         context "when the parent is a new record" do
 
@@ -55,15 +76,15 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
               person.posts.send(method, post)
             end
 
-            it "sets the foreign key on the relation" do
+            it "sets the foreign key on the association" do
               expect(post.person_id).to eq(person.id)
             end
 
-            it "sets the base on the inverse relation" do
+            it "sets the base on the inverse association" do
               expect(post.person).to eq(person)
             end
 
-            it "sets the same instance on the inverse relation" do
+            it "sets the same instance on the inverse association" do
               expect(post.person).to eql(person)
             end
 
@@ -75,7 +96,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
               expect(person.posts.size).to eq(1)
             end
 
-            it "returns the relation" do
+            it "returns the association" do
               expect(added).to eq(person.posts)
             end
           end
@@ -83,22 +104,22 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           context "when the child is persisted" do
 
             let(:post) do
-              Post.create
+              Post.create!
             end
 
             before do
               person.posts.send(method, post)
             end
 
-            it "sets the foreign key on the relation" do
+            it "sets the foreign key on the association" do
               expect(post.person_id).to eq(person.id)
             end
 
-            it "sets the base on the inverse relation" do
+            it "sets the base on the inverse association" do
               expect(post.person).to eq(person)
             end
 
-            it "sets the same instance on the inverse relation" do
+            it "sets the same instance on the inverse association" do
               expect(post.person).to eql(person)
             end
 
@@ -113,11 +134,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             context "when subsequently saving the parent" do
 
               before do
-                person.save
-                post.save
+                person.save!
+                post.save!
               end
 
-              it "returns the correct count of the relation" do
+              it "returns the correct count of the association" do
                 expect(person.posts.count).to eq(1)
               end
             end
@@ -127,20 +148,20 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when appending in a parent create block" do
 
           let!(:post) do
-            Post.create(title: "testing")
+            Post.create!(title: "testing")
           end
 
           let!(:person) do
-            Person.create do |doc|
+            Person.create! do |doc|
               doc.posts << post
             end
           end
 
-          it "adds the documents to the relation" do
+          it "adds the documents to the association" do
             expect(person.posts).to eq([ post ])
           end
 
-          it "sets the foreign key on the inverse relation" do
+          it "sets the foreign key on the inverse association" do
             expect(post.person_id).to eq(person.id)
           end
 
@@ -160,7 +181,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when the parent is not a new record" do
 
           let(:person) do
-            Person.create
+            Person.create!
           end
 
           let(:post) do
@@ -171,15 +192,15 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             person.posts.send(method, post)
           end
 
-          it "sets the foreign key on the relation" do
+          it "sets the foreign key on the association" do
             expect(post.person_id).to eq(person.id)
           end
 
-          it "sets the base on the inverse relation" do
+          it "sets the base on the inverse association" do
             expect(post.person).to eq(person)
           end
 
-          it "sets the same instance on the inverse relation" do
+          it "sets the same instance on the inverse association" do
             expect(post.person).to eql(person)
           end
 
@@ -200,16 +221,16 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             expect(person.changed).to eq([])
           end
 
-          context "when the related item has embedded relations" do
+          context "when the related item has embedded associations" do
 
             let!(:user) do
-              User.create
+              User.create!
             end
 
             before do
-              p = Post.create(roles: [ Role.create ])
+              p = Post.create!(roles: [ Role.create! ])
               user.posts = [ p ]
-              user.save
+              user.save!
             end
 
             it "add the document to the target" do
@@ -229,7 +250,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             end
           end
 
-          context "when documents already exist on the relation" do
+          context "when documents already exist on the association" do
 
             let(:post_two) do
               Post.new(title: "Test")
@@ -239,15 +260,15 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
               person.posts.send(method, post_two)
             end
 
-            it "sets the foreign key on the relation" do
+            it "sets the foreign key on the association" do
               expect(post_two.person_id).to eq(person.id)
             end
 
-            it "sets the base on the inverse relation" do
+            it "sets the base on the inverse association" do
               expect(post_two.person).to eq(person)
             end
 
-            it "sets the same instance on the inverse relation" do
+            it "sets the same instance on the inverse association" do
               expect(post_two.person).to eql(person)
             end
 
@@ -274,10 +295,10 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         end
       end
 
-      context "when.adding to the relation" do
+      context "when.adding to the association" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         context "when the operation succeeds" do
@@ -290,7 +311,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             person.posts.send(method, post)
           end
 
-          it "adds the document to the relation" do
+          it "adds the document to the association" do
             expect(person.posts).to eq([ post ])
           end
         end
@@ -298,7 +319,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when the operation fails" do
 
           let!(:existing) do
-            Post.create
+            Post.create!
           end
 
           let(:post) do
@@ -315,7 +336,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         end
       end
 
-      context "when the relations are polymorphic" do
+      context "when the associations are polymorphic" do
 
         context "when the parent is a new record" do
 
@@ -331,11 +352,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             movie.ratings.send(method, rating)
           end
 
-          it "sets the foreign key on the relation" do
+          it "sets the foreign key on the association" do
             expect(rating.ratable_id).to eq(movie.id)
           end
 
-          it "sets the base on the inverse relation" do
+          it "sets the base on the inverse association" do
             expect(rating.ratable).to eq(movie)
           end
 
@@ -351,7 +372,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when the parent is not a new record" do
 
           let(:movie) do
-            Movie.create
+            Movie.create!
           end
 
           let(:rating) do
@@ -362,11 +383,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             movie.ratings.send(method, rating)
           end
 
-          it "sets the foreign key on the relation" do
+          it "sets the foreign key on the association" do
             expect(rating.ratable_id).to eq(movie.id)
           end
 
-          it "sets the base on the inverse relation" do
+          it "sets the base on the inverse association" do
             expect(rating.ratable).to eq(movie)
           end
 
@@ -384,7 +405,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
 
   describe "#=" do
 
-    context "when the relation is not polymorphic" do
+    context "when the association is not polymorphic" do
 
       context "when the parent is a new record" do
 
@@ -400,15 +421,15 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           person.posts = [ post ]
         end
 
-        it "sets the target of the relation" do
+        it "sets the target of the association" do
           expect(person.posts._target).to eq([ post ])
         end
 
-        it "sets the foreign key on the relation" do
+        it "sets the foreign key on the association" do
           expect(post.person_id).to eq(person.id)
         end
 
-        it "sets the base on the inverse relation" do
+        it "sets the base on the inverse association" do
           expect(post.person).to eq(person)
         end
 
@@ -420,7 +441,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       context "when the parent is not a new record" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let(:post) do
@@ -431,15 +452,15 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           person.posts = [ post ]
         end
 
-        it "sets the target of the relation" do
+        it "sets the target of the association" do
           expect(person.posts._target).to eq([ post ])
         end
 
-        it "sets the foreign key of the relation" do
+        it "sets the foreign key of the association" do
           expect(post.person_id).to eq(person.id)
         end
 
-        it "sets the base on the inverse relation" do
+        it "sets the base on the inverse association" do
           expect(post.person).to eq(person)
         end
 
@@ -447,7 +468,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           expect(post).to be_persisted
         end
 
-        context "when replacing the relation with the same documents" do
+        context "when replacing the association with the same documents" do
 
           context "when using the same in memory instance" do
 
@@ -455,11 +476,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
               person.posts = [ post ]
             end
 
-            it "keeps the relation intact" do
+            it "keeps the association intact" do
               expect(person.posts).to eq([ post ])
             end
 
-            it "does not delete the relation" do
+            it "does not delete the association" do
               expect(person.reload.posts).to eq([ post ])
             end
           end
@@ -474,11 +495,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
               from_db.posts = [ post ]
             end
 
-            it "keeps the relation intact" do
+            it "keeps the association intact" do
               expect(from_db.posts).to eq([ post ])
             end
 
-            it "does not delete the relation" do
+            it "does not delete the association" do
               expect(from_db.reload.posts).to eq([ post ])
             end
           end
@@ -487,7 +508,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when replacing the with a combination of old and new docs" do
 
           let(:new_post) do
-            Post.create(title: "new post")
+            Post.create!(title: "new post")
           end
 
           context "when using the same in memory instance" do
@@ -496,7 +517,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
               person.posts = [ post, new_post ]
             end
 
-            it "keeps the relation intact" do
+            it "keeps the association intact" do
               expect(person.posts.size).to eq(2)
             end
 
@@ -508,7 +529,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
               expect(person.posts).to include(new_post)
             end
 
-            it "does not delete the relation" do
+            it "does not delete the association" do
               expect(person.reload.posts).to eq([ post, new_post ])
             end
           end
@@ -523,11 +544,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
               from_db.posts = [ post, new_post ]
             end
 
-            it "keeps the relation intact" do
+            it "keeps the association intact" do
               expect(from_db.posts).to eq([ post, new_post ])
             end
 
-            it "does not delete the relation" do
+            it "does not delete the association" do
               expect(from_db.reload.posts).to eq([ post, new_post ])
             end
           end
@@ -536,7 +557,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when replacing the with a combination of only new docs" do
 
           let(:new_post) do
-            Post.create(title: "new post")
+            Post.create!(title: "new post")
           end
 
           context "when using the same in memory instance" do
@@ -545,11 +566,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
               person.posts = [ new_post ]
             end
 
-            it "keeps the relation intact" do
+            it "keeps the association intact" do
               expect(person.posts).to eq([ new_post ])
             end
 
-            it "does not delete the relation" do
+            it "does not delete the association" do
               expect(person.reload.posts).to eq([ new_post ])
             end
           end
@@ -564,11 +585,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
               from_db.posts = [ new_post ]
             end
 
-            it "keeps the relation intact" do
+            it "keeps the association intact" do
               expect(from_db.posts).to eq([ new_post ])
             end
 
-            it "does not delete the relation" do
+            it "does not delete the association" do
               expect(from_db.reload.posts).to eq([ new_post ])
             end
           end
@@ -576,7 +597,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       end
     end
 
-    context "when the relation is polymorphic" do
+    context "when the association is polymorphic" do
 
       context "when the parent is a new record" do
 
@@ -592,15 +613,15 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           movie.ratings = [ rating ]
         end
 
-        it "sets the target of the relation" do
+        it "sets the target of the association" do
           expect(movie.ratings._target).to eq([ rating ])
         end
 
-        it "sets the foreign key on the relation" do
+        it "sets the foreign key on the association" do
           expect(rating.ratable_id).to eq(movie.id)
         end
 
-        it "sets the base on the inverse relation" do
+        it "sets the base on the inverse association" do
           expect(rating.ratable).to eq(movie)
         end
 
@@ -612,7 +633,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       context "when the parent is not a new record" do
 
         let(:movie) do
-          Movie.create
+          Movie.create!
         end
 
         let(:rating) do
@@ -623,15 +644,15 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           movie.ratings = [ rating ]
         end
 
-        it "sets the target of the relation" do
+        it "sets the target of the association" do
           expect(movie.ratings._target).to eq([ rating ])
         end
 
-        it "sets the foreign key of the relation" do
+        it "sets the foreign key of the association" do
           expect(rating.ratable_id).to eq(movie.id)
         end
 
-        it "sets the base on the inverse relation" do
+        it "sets the base on the inverse association" do
           expect(rating.ratable).to eq(movie)
         end
 
@@ -647,11 +668,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
     context "when the parent is persisted" do
 
       let(:posts) do
-        [ Post.create(title: "1"), Post.create(title: "2") ]
+        [ Post.create!(title: "1"), Post.create!(title: "2") ]
       end
 
       let(:person) do
-        Person.create(posts: posts)
+        Person.create!(posts: posts)
       end
 
       context "when the parent has multiple children" do
@@ -673,7 +694,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
 
   describe "#= nil" do
 
-    context "when the relation is not polymorphic" do
+    context "when the association is not polymorphic" do
 
       context "when the parent is a new record" do
 
@@ -690,11 +711,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           person.posts = nil
         end
 
-        it "sets the relation to an empty array" do
+        it "sets the association to an empty array" do
           expect(person.posts).to be_empty
         end
 
-        it "removed the inverse relation" do
+        it "removed the inverse association" do
           expect(post.person).to be_nil
         end
 
@@ -706,7 +727,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       context "when the parent is not a new record" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         context "when dependent is destructive" do
@@ -720,11 +741,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             person.posts = nil
           end
 
-          it "sets the relation to empty" do
+          it "sets the association to empty" do
             expect(person.posts).to be_empty
           end
 
-          it "removed the inverse relation" do
+          it "removed the inverse association" do
             expect(post.person).to be_nil
           end
 
@@ -748,11 +769,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             person.drugs = nil
           end
 
-          it "sets the relation to empty" do
+          it "sets the association to empty" do
             expect(person.drugs).to be_empty
           end
 
-          it "removed the inverse relation" do
+          it "removed the inverse association" do
             expect(drug.person).to be_nil
           end
 
@@ -760,14 +781,14 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             expect(drug.person_id).to be_nil
           end
 
-          it "nullifies the relation" do
+          it "nullifies the association" do
             expect(drug).to_not be_destroyed
           end
         end
       end
     end
 
-    context "when the relation is polymorphic" do
+    context "when the association is polymorphic" do
 
       context "when the parent is a new record" do
 
@@ -784,11 +805,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           movie.ratings = nil
         end
 
-        it "sets the relation to an empty array" do
+        it "sets the association to an empty array" do
           expect(movie.ratings).to be_empty
         end
 
-        it "removed the inverse relation" do
+        it "removed the inverse association" do
           expect(rating.ratable).to be_nil
         end
 
@@ -800,7 +821,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       context "when the parent is not a new record" do
 
         let(:movie) do
-          Movie.create
+          Movie.create!
         end
 
         let(:rating) do
@@ -812,11 +833,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           movie.ratings = nil
         end
 
-        it "sets the relation to empty" do
+        it "sets the association to empty" do
           expect(movie.ratings).to be_empty
         end
 
-        it "removed the inverse relation" do
+        it "removed the inverse association" do
           expect(rating.ratable).to be_nil
         end
 
@@ -841,11 +862,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
     end
 
     let(:post_one) do
-      Post.create
+      Post.create!
     end
 
     let(:post_two) do
-      Post.create
+      Post.create!
     end
 
     before do
@@ -860,14 +881,14 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
   describe "#\{name}_ids" do
 
     let(:posts) do
-      [ Post.create, Post.create ]
+      [ Post.create!, Post.create! ]
     end
 
     let(:person) do
-      Person.create(posts: posts)
+      Person.create!(posts: posts)
     end
 
-    it "returns ids of documents that are in the relation" do
+    it "returns ids of documents that are in the association" do
       expect(person.post_ids).to eq(posts.map(&:id))
     end
   end
@@ -875,8 +896,16 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
   [ :build, :new ].each do |method|
 
     describe "##{method}" do
+      context 'when model has #initialize' do
+        let(:parent) { RefHasManySpec::OverrideInitialize::Parent.create }
+        let(:child)  { parent.children.send(method) }
+
+        it 'should call #initialize' do
+          expect(child.name).to be == "default"
+        end
+      end
 
-      context "when the relation is not polymorphic" do
+      context "when the association is not polymorphic" do
 
         context "when the parent is a new record" do
 
@@ -888,11 +917,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             person.posts.send(method, title: "$$$")
           end
 
-          it "sets the foreign key on the relation" do
+          it "sets the foreign key on the association" do
             expect(post.person_id).to eq(person.id)
           end
 
-          it "sets the base on the inverse relation" do
+          it "sets the base on the inverse association" do
             expect(post.person).to eq(person)
           end
 
@@ -920,18 +949,18 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when the parent is not a new record" do
 
           let(:person) do
-            Person.create
+            Person.create!
           end
 
           let!(:post) do
             person.posts.send(method, text: "Testing")
           end
 
-          it "sets the foreign key on the relation" do
+          it "sets the foreign key on the association" do
             expect(post.person_id).to eq(person.id)
           end
 
-          it "sets the base on the inverse relation" do
+          it "sets the base on the inverse association" do
             expect(post.person).to eq(person)
           end
 
@@ -949,12 +978,12 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         end
       end
 
-      context "when the relation is polymorphic" do
+      context "when the association is polymorphic" do
 
         context "when the parent is a subclass" do
 
           let(:video_game) do
-            VideoGame.create
+            VideoGame.create!
           end
 
           let(:rating) do
@@ -980,11 +1009,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             movie.ratings.send(method, value: 3)
           end
 
-          it "sets the foreign key on the relation" do
+          it "sets the foreign key on the association" do
             expect(rating.ratable_id).to eq(movie.id)
           end
 
-          it "sets the base on the inverse relation" do
+          it "sets the base on the inverse association" do
             expect(rating.ratable).to eq(movie)
           end
 
@@ -1008,18 +1037,18 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when the parent is not a new record" do
 
           let(:movie) do
-            Movie.create
+            Movie.create!
           end
 
           let!(:rating) do
             movie.ratings.send(method, value: 4)
           end
 
-          it "sets the foreign key on the relation" do
+          it "sets the foreign key on the association" do
             expect(rating.ratable_id).to eq(movie.id)
           end
 
-          it "sets the base on the inverse relation" do
+          it "sets the base on the inverse association" do
             expect(rating.ratable).to eq(movie)
           end
 
@@ -1041,25 +1070,25 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
 
   describe "#clear" do
 
-    context "when the relation is not polymorphic" do
+    context "when the association is not polymorphic" do
 
       context "when the parent has been persisted" do
 
         let!(:person) do
-          Person.create
+          Person.create!
         end
 
         context "when the children are persisted" do
 
           let!(:post) do
-            person.posts.create(title: "Testing")
+            person.posts.create!(title: "Testing")
           end
 
-          let!(:relation) do
+          let!(:association) do
             person.posts.clear
           end
 
-          it "clears out the relation" do
+          it "clears out the association" do
             expect(person.posts).to be_empty
           end
 
@@ -1071,8 +1100,8 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             expect(person.reload.posts).to be_empty
           end
 
-          it "returns the relation" do
-            expect(relation).to be_empty
+          it "returns the association" do
+            expect(association).to be_empty
           end
         end
 
@@ -1082,11 +1111,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             person.posts.build(title: "Testing")
           end
 
-          let!(:relation) do
+          let!(:association) do
             person.posts.clear
           end
 
-          it "clears out the relation" do
+          it "clears out the association" do
             expect(person.posts).to be_empty
           end
         end
@@ -1102,35 +1131,35 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           person.posts.build(title: "Testing")
         end
 
-        let!(:relation) do
+        let!(:association) do
           person.posts.clear
         end
 
-        it "clears out the relation" do
+        it "clears out the association" do
           expect(person.posts).to be_empty
         end
       end
     end
 
-    context "when the relation is polymorphic" do
+    context "when the association is polymorphic" do
 
       context "when the parent has been persisted" do
 
         let!(:movie) do
-          Movie.create
+          Movie.create!
         end
 
         context "when the children are persisted" do
 
           let!(:rating) do
-            movie.ratings.create(value: 1)
+            movie.ratings.create!(value: 1)
           end
 
-          let!(:relation) do
+          let!(:association) do
             movie.ratings.clear
           end
 
-          it "clears out the relation" do
+          it "clears out the association" do
             expect(movie.ratings).to be_empty
           end
 
@@ -1142,8 +1171,8 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             expect(movie.reload.ratings).to be_empty
           end
 
-          it "returns the relation" do
-            expect(relation).to be_empty
+          it "returns the association" do
+            expect(association).to be_empty
           end
         end
 
@@ -1153,11 +1182,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             movie.ratings.build(value: 3)
           end
 
-          let!(:relation) do
+          let!(:association) do
             movie.ratings.clear
           end
 
-          it "clears out the relation" do
+          it "clears out the association" do
             expect(movie.ratings).to be_empty
           end
         end
@@ -1173,11 +1202,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           movie.ratings.build(value: 2)
         end
 
-        let!(:relation) do
+        let!(:association) do
           movie.ratings.clear
         end
 
-        it "clears out the relation" do
+        it "clears out the association" do
           expect(movie.ratings).to be_empty
         end
       end
@@ -1186,7 +1215,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
 
   describe "#concat" do
 
-    context "when the relations are not polymorphic" do
+    context "when the associations are not polymorphic" do
 
       context "when the parent is a new record" do
 
@@ -1202,15 +1231,15 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           person.posts.concat([ post ])
         end
 
-        it "sets the foreign key on the relation" do
+        it "sets the foreign key on the association" do
           expect(post.person_id).to eq(person.id)
         end
 
-        it "sets the base on the inverse relation" do
+        it "sets the base on the inverse association" do
           expect(post.person).to eq(person)
         end
 
-        it "sets the same instance on the inverse relation" do
+        it "sets the same instance on the inverse association" do
           expect(post.person).to eql(person)
         end
 
@@ -1226,20 +1255,20 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       context "when appending in a parent create block" do
 
         let!(:post) do
-          Post.create(title: "testing")
+          Post.create!(title: "testing")
         end
 
         let!(:person) do
-          Person.create do |doc|
+          Person.create! do |doc|
             doc.posts.concat([ post ])
           end
         end
 
-        it "adds the documents to the relation" do
+        it "adds the documents to the association" do
           expect(person.posts).to eq([ post ])
         end
 
-        it "sets the foreign key on the inverse relation" do
+        it "sets the foreign key on the inverse association" do
           expect(post.person_id).to eq(person.id)
         end
 
@@ -1259,7 +1288,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       context "when the parent is not a new record" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let(:post) do
@@ -1274,15 +1303,15 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           person.posts.concat([ post, post_three ])
         end
 
-        it "sets the foreign key on the relation" do
+        it "sets the foreign key on the association" do
           expect(post.person_id).to eq(person.id)
         end
 
-        it "sets the base on the inverse relation" do
+        it "sets the base on the inverse association" do
           expect(post.person).to eq(person)
         end
 
-        it "sets the same instance on the inverse relation" do
+        it "sets the same instance on the inverse association" do
           expect(post.person).to eql(person)
         end
 
@@ -1294,7 +1323,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           expect(person.posts.count).to eq(2)
         end
 
-        context "when documents already exist on the relation" do
+        context "when documents already exist on the association" do
 
           let(:post_two) do
             Post.new(title: "Test")
@@ -1304,15 +1333,15 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             person.posts.concat([ post_two ])
           end
 
-          it "sets the foreign key on the relation" do
+          it "sets the foreign key on the association" do
             expect(post_two.person_id).to eq(person.id)
           end
 
-          it "sets the base on the inverse relation" do
+          it "sets the base on the inverse association" do
             expect(post_two.person).to eq(person)
           end
 
-          it "sets the same instance on the inverse relation" do
+          it "sets the same instance on the inverse association" do
             expect(post_two.person).to eql(person)
           end
 
@@ -1336,7 +1365,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
     end
   end
 
-  context "when the relations are polymorphic" do
+  context "when the associations are polymorphic" do
 
     context "when the parent is a new record" do
 
@@ -1352,11 +1381,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         movie.ratings.concat([ rating ])
       end
 
-      it "sets the foreign key on the relation" do
+      it "sets the foreign key on the association" do
         expect(rating.ratable_id).to eq(movie.id)
       end
 
-      it "sets the base on the inverse relation" do
+      it "sets the base on the inverse association" do
         expect(rating.ratable).to eq(movie)
       end
 
@@ -1372,7 +1401,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
     context "when the parent is not a new record" do
 
       let(:movie) do
-        Movie.create
+        Movie.create!
       end
 
       let(:rating) do
@@ -1383,11 +1412,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         movie.ratings.concat([ rating ])
       end
 
-      it "sets the foreign key on the relation" do
+      it "sets the foreign key on the association" do
         expect(rating.ratable_id).to eq(movie.id)
       end
 
-      it "sets the base on the inverse relation" do
+      it "sets the base on the inverse association" do
         expect(rating.ratable).to eq(movie)
       end
 
@@ -1404,18 +1433,23 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
   describe "#count" do
 
     let(:movie) do
-      Movie.create
+      Movie.create!
     end
 
     context "when documents have been persisted" do
 
       let!(:rating) do
-        movie.ratings.create(value: 1)
+        movie.ratings.create!(value: 1)
       end
 
       it "returns the number of persisted documents" do
         expect(movie.ratings.count).to eq(1)
       end
+
+      it "block form includes persisted results" do
+        expect(movie.ratings.count {|r| r.value >= 1 }).to eq(1)
+        expect(movie.ratings.count {|r| r.value >= 2 }).to eq(0)
+      end
     end
 
     context "when documents have not been persisted" do
@@ -1427,14 +1461,42 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       it "returns 0" do
         expect(movie.ratings.count).to eq(0)
       end
+
+      it "block form does not include unpersisted results" do
+        expect(movie.ratings.count {|r| r.value == 1 }).to eq(0)
+      end
+    end
+
+    context "when mixed persisted and unpersisted documents" do
+
+      before do
+        movie.ratings.create(value: 1)
+        movie.ratings.build(value: 2)
+      end
+
+      it "returns 1" do
+        expect(movie.ratings.count).to eq(1)
+      end
+
+      it "block form includes only persisted results" do
+        expect(movie.ratings.count {|r| r.value >= 1 }).to eq(1)
+        expect(movie.ratings.count {|r| r.value == 2 }).to eq(0)
+      end
+    end
+
+    context "when no document is added" do
+
+      it "returns false" do
+        expect(movie.ratings.any?).to be false
+      end
     end
 
     context "when new documents exist in the database" do
 
-      context "when the documents are part of the relation" do
+      context "when the documents are part of the association" do
 
         before do
-          Rating.create(ratable: movie)
+          Rating.create!(ratable: movie)
         end
 
         it "returns the count from the db" do
@@ -1442,10 +1504,10 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         end
       end
 
-      context "when the documents are not part of the relation" do
+      context "when the documents are not part of the association" do
 
         before do
-          Rating.create
+          Rating.create!
         end
 
         it "returns the count from the db" do
@@ -1455,16 +1517,198 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
     end
   end
 
+  describe "#any?" do
+
+    shared_examples 'does not query database when association is loaded' do
+
+      let(:fresh_movie) { Movie.find(movie.id) }
+
+      context 'when association is not loaded' do
+        it 'queries database on each call' do
+          fresh_movie
+
+          expect_query(1) do
+            fresh_movie.ratings.any?.should be expected_result
+          end
+
+          expect_query(1) do
+            fresh_movie.ratings.any?.should be expected_result
+          end
+        end
+
+        context 'when using a block' do
+          it 'queries database on first call only' do
+            fresh_movie
+
+            expect_query(1) do
+              fresh_movie.ratings.any? { false }.should be false
+            end
+
+            expect_no_queries do
+              fresh_movie.ratings.any? { false }.should be false
+            end
+          end
+        end
+      end
+
+      context 'when association is loaded' do
+        it 'does not query database' do
+          fresh_movie
+
+          expect_query(1) do
+            fresh_movie.ratings.any?.should be expected_result
+          end
+
+          fresh_movie.ratings.to_a
+
+          expect_no_queries do
+            fresh_movie.ratings.any?.should be expected_result
+          end
+        end
+      end
+    end
+
+    let(:movie) do
+      Movie.create!
+    end
+
+    context "when nothing exists on the association" do
+
+      context "when no document is added" do
+
+        let!(:movie) do
+          Movie.create!
+        end
+
+        it "returns false" do
+          expect(movie.ratings.any?).to be false
+        end
+
+        let(:expected_result) { false }
+        include_examples 'does not query database when association is loaded'
+      end
+
+      context "when the document is destroyed" do
+
+        before do
+          Rating.create!
+        end
+
+        let!(:movie) do
+          Movie.create!
+        end
+
+        it "returns false" do
+          movie.destroy
+          expect(movie.ratings.any?).to be false
+        end
+      end
+    end
+
+    context "when appending to a association and _loaded/_unloaded are empty" do
+
+      let!(:movie) do
+        Movie.create!
+      end
+
+      before do
+        movie.ratings << Rating.new
+      end
+
+      it "returns true" do
+        expect(movie.ratings.any?).to be true
+      end
+
+      context 'when association is not loaded' do
+        before do
+          movie.ratings._loaded?.should be false
+        end
+
+        it 'does not query the database because it knows about the added models' do
+          expect_no_queries do
+            movie.ratings.any?.should be true
+          end
+        end
+      end
+
+      context 'when association is loaded' do
+        it 'does not query database' do
+          expect_no_queries do
+            movie.ratings.any?.should be true
+          end
+
+          movie.ratings.to_a
+
+          expect_no_queries do
+            movie.ratings.any?.should be true
+          end
+        end
+      end
+    end
+
+    context "when appending to a association in a transaction" do
+      require_transaction_support
+
+      let!(:movie) do
+        Movie.create!
+      end
+
+      it "returns true" do
+        movie.with_session do |session|
+          session.with_transaction do
+            expect{ movie.ratings << Rating.new }.to_not raise_error
+            expect(movie.ratings.any?).to be true
+          end
+        end
+      end
+    end
+
+    context "when documents have been persisted" do
+
+      let!(:rating) do
+        movie.ratings.create!(value: 1)
+      end
+
+      it "returns true" do
+        expect(movie.ratings.any?).to be true
+      end
+
+      let(:expected_result) { true }
+      include_examples 'does not query database when association is loaded'
+    end
+
+    context "when documents have not been persisted" do
+
+      let!(:rating) do
+        movie.ratings.build(value: 1)
+      end
+
+      it "returns false" do
+        expect(movie.ratings.any?).to be true
+      end
+    end
+
+    context "when new documents exist in the database" do
+      before do
+        Rating.create!(ratable: movie)
+      end
+
+      it "returns true" do
+        expect(movie.ratings.any?).to be true
+      end
+    end
+  end
+
   describe "#create" do
 
     context "when providing multiple attributes" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:posts) do
-        person.posts.create([{ text: "Test1" }, { text: "Test2" }])
+        person.posts.create!([{ text: "Test1" }, { text: "Test2" }])
       end
 
       it "creates multiple documents" do
@@ -1484,7 +1728,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       end
     end
 
-    context "when the relation is not polymorphic" do
+    context "when the association is not polymorphic" do
 
       context "when the parent is a new record" do
 
@@ -1493,7 +1737,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         end
 
         let(:post) do
-          person.posts.create(text: "Testing")
+          person.posts.create!(text: "Testing")
         end
 
         it "raises an unsaved document error" do
@@ -1506,11 +1750,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when the operation is successful" do
 
           let(:person) do
-            Person.create
+            Person.create!
           end
 
           let!(:post) do
-            person.posts.create(text: "Testing")
+            person.posts.create!(text: "Testing")
           end
 
           it "creates the document" do
@@ -1521,16 +1765,16 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when the operation fails" do
 
           let(:person) do
-            Person.create
+            Person.create!
           end
 
           let!(:existing) do
-            Post.create
+            Post.create!
           end
 
           it "raises an error" do
             expect {
-              person.posts.create do |doc|
+              person.posts.create! do |doc|
                 doc._id = existing.id
               end
             }.to raise_error(Mongo::Error::OperationFailure)
@@ -1541,20 +1785,20 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       context "when the parent is not a new record" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let!(:post) do
-          person.posts.create(text: "Testing") do |post|
+          person.posts.create!(text: "Testing") do |post|
             post.content = "The Content"
           end
         end
 
-        it "sets the foreign key on the relation" do
+        it "sets the foreign key on the association" do
           expect(post.person_id).to eq(person.id)
         end
 
-        it "sets the base on the inverse relation" do
+        it "sets the base on the inverse association" do
           expect(post.person).to eq(person)
         end
 
@@ -1578,11 +1822,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       context "when passing a new object" do
 
         let!(:odd) do
-          Odd.create(name: 'one')
+          Odd.create!(name: 'one')
         end
 
         let!(:even) do
-          odd.evens.create(name: 'two', odds: [Odd.new(name: 'three')])
+          odd.evens.create!(name: 'two', odds: [Odd.new(name: 'three')])
         end
 
         it "only push one even to the list" do
@@ -1603,7 +1847,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       end
     end
 
-    context "when the relation is polymorphic" do
+    context "when the association is polymorphic" do
 
       context "when the parent is a new record" do
 
@@ -1612,7 +1856,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         end
 
         let(:rating) do
-          movie.ratings.create(value: 1)
+          movie.ratings.create!(value: 1)
         end
 
         it "raises an unsaved document error" do
@@ -1623,18 +1867,18 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       context "when the parent is not a new record" do
 
         let(:movie) do
-          Movie.create
+          Movie.create!
         end
 
         let!(:rating) do
-          movie.ratings.create(value: 3)
+          movie.ratings.create!(value: 3)
         end
 
-        it "sets the foreign key on the relation" do
+        it "sets the foreign key on the association" do
           expect(rating.ratable_id).to eq(movie.id)
         end
 
-        it "sets the base on the inverse relation" do
+        it "sets the base on the inverse association" do
           expect(rating.ratable).to eq(movie)
         end
 
@@ -1652,7 +1896,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       end
     end
 
-    context "when using a diferent primary_key" do
+    context "when using a different primary_key" do
 
       let(:person) do
         Person.create!(username: 'arthurnn')
@@ -1673,7 +1917,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
     context "when providing multiple attributes" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:posts) do
@@ -1697,7 +1941,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       end
     end
 
-    context "when the relation is not polymorphic" do
+    context "when the association is not polymorphic" do
 
       context "when the parent is a new record" do
 
@@ -1717,18 +1961,18 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       context "when the parent is not a new record" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let!(:post) do
           person.posts.create!(title: "Testing")
         end
 
-        it "sets the foreign key on the relation" do
+        it "sets the foreign key on the association" do
           expect(post.person_id).to eq(person.id)
         end
 
-        it "sets the base on the inverse relation" do
+        it "sets the base on the inverse association" do
           expect(post.person).to eq(person)
         end
 
@@ -1755,7 +1999,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       end
     end
 
-    context "when the relation is polymorphic" do
+    context "when the association is polymorphic" do
 
       context "when the parent is a new record" do
 
@@ -1775,18 +2019,18 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       context "when the parent is not a new record" do
 
         let(:movie) do
-          Movie.create
+          Movie.create!
         end
 
         let!(:rating) do
           movie.ratings.create!(value: 4)
         end
 
-        it "sets the foreign key on the relation" do
+        it "sets the foreign key on the association" do
           expect(rating.ratable_id).to eq(movie.id)
         end
 
-        it "sets the base on the inverse relation" do
+        it "sets the base on the inverse association" do
           expect(rating.ratable).to eq(movie)
         end
 
@@ -1820,7 +2064,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       Movie.new
     end
 
-    context "when the relation is polymorphic" do
+    context "when the association is polymorphic" do
 
       let(:association) do
         Movie.relations["ratings"]
@@ -1840,7 +2084,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       end
     end
 
-    context "when the relation is not polymorphic" do
+    context "when the association is not polymorphic" do
 
       let(:association) do
         Person.relations["posts"]
@@ -1860,172 +2104,130 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
     end
   end
 
-  describe "#delete" do
-
-    let!(:person) do
-      Person.create(username: 'arthurnn')
-    end
+  %i[ delete delete_one ].each do |method|
+    describe "##{method}" do
+      let!(:person) { Person.create!(username: 'arthurnn') }
 
-    context "when the document is found" do
+      context 'when the document is found' do
+        context 'when no dependent option is set' do
+          context 'when we are assigning attributes' do
+            let!(:drug) { person.drugs.create! }
+            let(:deleted) { person.drugs.send(method, drug) }
 
-      context "when no dependent option is set" do
+            before do
+              Mongoid::Threaded.begin_execution(:assign)
+            end
 
-        context "when we are assigning attributes" do
+            after do
+              Mongoid::Threaded.exit_execution(:assign)
+            end
 
-          let!(:drug) do
-            person.drugs.create
+            it 'does not cascade' do
+              expect(deleted.changes.keys).to eq([ 'person_id' ])
+            end
           end
 
-          before do
-            Mongoid::Threaded.begin_execution(:assign)
-          end
+          context 'when the document is loaded' do
+            let!(:drug) { person.drugs.create! }
+            let!(:deleted) { person.drugs.send(method, drug) }
 
-          after do
-            Mongoid::Threaded.exit_execution(:assign)
-          end
+            it 'returns the document' do
+              expect(deleted).to eq(drug)
+            end
 
-          let(:deleted) do
-            person.drugs.delete(drug)
-          end
+            it 'deletes the foreign key' do
+              expect(drug.person_id).to be_nil
+            end
 
-          it "does not cascade" do
-            expect(deleted.changes.keys).to eq([ "person_id" ])
+            it 'removes the document from the association' do
+              expect(person.drugs).not_to include(drug)
+            end
           end
-        end
 
-        context "when the document is loaded" do
+          context 'when the document is not loaded' do
+            let!(:drug) { Drug.create!(person_id: person.username) }
+            let!(:deleted) { person.drugs.send(method, drug) }
 
-          let!(:drug) do
-            person.drugs.create
-          end
+            it 'returns the document' do
+              expect(deleted).to eq(drug)
+            end
 
-          let!(:deleted) do
-            person.drugs.delete(drug)
-          end
+            it 'deletes the foreign key' do
+              expect(drug.person_id).to be_nil
+            end
 
-          it "returns the document" do
-            expect(deleted).to eq(drug)
+            it 'removes the document from the association' do
+              expect(person.drugs).not_to include(drug)
+            end
           end
+        end
 
-          it "deletes the foreign key" do
-            expect(drug.person_id).to be_nil
-          end
+        context 'when dependent is delete' do
+          context 'when the document is loaded' do
+            let!(:post) { person.posts.create!(title: 'test') }
+            let!(:deleted) { person.posts.send(method, post) }
 
-          it "removes the document from the relation" do
-            expect(person.drugs).to_not include(drug)
-          end
-        end
+            it 'returns the document' do
+              expect(deleted).to eq(post)
+            end
 
-        context "when the document is not loaded" do
+            it 'deletes the document' do
+              expect(post).to be_destroyed
+            end
 
-          let!(:drug) do
-            Drug.create(person_id: person.username)
+            it 'removes the document from the association' do
+              expect(person.posts).not_to include(post)
+            end
           end
 
-          let!(:deleted) do
-            person.drugs.delete(drug)
-          end
+          context 'when the document is not loaded' do
+            let!(:post) { Post.create!(title: 'foo', person_id: person.id) }
+            let!(:deleted) { person.posts.send(method, post) }
 
-          it "returns the document" do
-            expect(deleted).to eq(drug)
-          end
+            it 'returns the document' do
+              expect(deleted).to eq(post)
+            end
 
-          it "deletes the foreign key" do
-            expect(drug.person_id).to be_nil
-          end
+            it 'deletes the document' do
+              expect(post).to be_destroyed
+            end
 
-          it "removes the document from the relation" do
-            expect(person.drugs).to_not include(drug)
+            it 'removes the document from the association' do
+              expect(person.posts).not_to include(post)
+            end
           end
         end
       end
 
-      context "when dependent is delete" do
-
-        context "when the document is loaded" do
-
-          let!(:post) do
-            person.posts.create(title: "test")
-          end
-
-          let!(:deleted) do
-            person.posts.delete(post)
-          end
-
-          it "returns the document" do
-            expect(deleted).to eq(post)
-          end
-
-          it "deletes the document" do
-            expect(post).to be_destroyed
-          end
+      context 'when the document is not found' do
+        let!(:post) { Post.create!(title: 'foo') }
+        let!(:deleted) { person.posts.send(method, post) }
 
-          it "removes the document from the relation" do
-            expect(person.posts).to_not include(post)
-          end
+        it 'returns nil' do
+          expect(deleted).to be_nil
         end
 
-        context "when the document is not loaded" do
-
-          let!(:post) do
-            Post.create(title: "foo", person_id: person.id)
-          end
-
-          let!(:deleted) do
-            person.posts.delete(post)
-          end
-
-          it "returns the document" do
-            expect(deleted).to eq(post)
-          end
-
-          it "deletes the document" do
-            expect(post).to be_destroyed
-          end
-
-          it "removes the document from the relation" do
-            expect(person.posts).to_not include(post)
-          end
+        it 'does not delete the document' do
+          expect(post).to be_persisted
         end
       end
     end
-
-    context "when the document is not found" do
-
-      let!(:post) do
-        Post.create(title: "foo")
-      end
-
-      let!(:deleted) do
-        person.posts.delete(post)
-      end
-
-      it "returns nil" do
-        expect(deleted).to be_nil
-      end
-
-      it "does not delete the document" do
-        expect(post).to be_persisted
-      end
-    end
   end
 
   [ :delete_all, :destroy_all ].each do |method|
 
     describe "##{method}" do
 
-      context "when the relation is not polymorphic" do
+      context "when the association is not polymorphic" do
 
         context "when conditions are provided" do
 
           let(:person) do
-            Person.create(username: 'durran')
+            Person.create!(username: 'durran')
           end
 
-          before do
-            person.posts.create(title: "Testing")
-            person.posts.create(title: "Test")
-          end
+          let!(:post1) { person.posts.create!(title: "Testing") }
+          let!(:post2) { person.posts.create!(title: "Test") }
 
           it "removes the correct posts" do
             person.posts.send(method, { title: "Testing" })
@@ -2041,17 +2243,22 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           it "returns the number of documents deleted" do
             expect(person.posts.send(method, { title: "Testing" })).to eq(1)
           end
+
+          it "sets the association locally" do
+            person.posts.send(method, { title: "Testing" })
+            expect(person.posts).to eq([post2])
+          end
         end
 
         context "when conditions are not provided" do
 
           let(:person) do
-            Person.create
+            Person.create!
           end
 
           before do
-            person.posts.create(title: "Testing")
-            person.posts.create(title: "Test")
+            person.posts.create!(title: "Testing")
+            person.posts.create!(title: "Test")
           end
 
           it "removes the correct posts" do
@@ -2067,21 +2274,24 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           it "returns the number of documents deleted" do
             expect(person.posts.send(method)).to eq(2)
           end
+
+          it "sets the association locally" do
+            person.posts.send(method)
+            expect(person.posts).to eq([])
+          end
         end
       end
 
-      context "when the relation is polymorphic" do
+      context "when the association is polymorphic" do
 
         context "when conditions are provided" do
 
           let(:movie) do
-            Movie.create(title: "Bladerunner")
+            Movie.create!(title: "Bladerunner")
           end
 
-          before do
-            movie.ratings.create(value: 1)
-            movie.ratings.create(value: 2)
-          end
+          let!(:rating1) { movie.ratings.create!(value: 1) }
+          let!(:rating2) { movie.ratings.create!(value: 2) }
 
           it "removes the correct ratings" do
             movie.ratings.send(method, { value: 1 })
@@ -2096,17 +2306,22 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           it "returns the number of documents deleted" do
             expect(movie.ratings.send(method, { value: 1 })).to eq(1)
           end
+
+          it "sets the association locally" do
+            movie.ratings.send(method, { value: 1 })
+            expect(movie.ratings).to eq([rating2])
+          end
         end
 
         context "when conditions are not provided" do
 
           let(:movie) do
-            Movie.create(title: "Bladerunner")
+            Movie.create!(title: "Bladerunner")
           end
 
           before do
-            movie.ratings.create(value: 1)
-            movie.ratings.create(value: 2)
+            movie.ratings.create!(value: 1)
+            movie.ratings.create!(value: 2)
           end
 
           it "removes the correct ratings" do
@@ -2122,6 +2337,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           it "returns the number of documents deleted" do
             expect(movie.ratings.send(method)).to eq(2)
           end
+
+          it "sets the association locally" do
+            movie.ratings.send(method)
+            expect(movie.ratings).to eq([])
+          end
         end
       end
     end
@@ -2137,21 +2357,47 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
   describe "#exists?" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     context "when documents exist in the database" do
 
       before do
-        person.posts.create
+        person.posts.create!
       end
 
       it "returns true" do
         expect(person.posts.exists?).to be true
       end
+
+      context 'when association is not loaded' do
+        it 'queries database on each call' do
+          expect_query(1) do
+            person.posts.exists?.should be true
+          end
+
+          expect_query(1) do
+            person.posts.exists?.should be true
+          end
+        end
+      end
+
+      context 'when association is loaded' do
+        it 'queries database on each call' do
+          expect_query(1) do
+            person.posts.exists?.should be true
+          end
+
+          person.posts.to_a
+
+          expect_query(1) do
+            person.posts.exists?.should be true
+          end
+        end
+      end
     end
 
-    context "when no documents exist in the database" do
+    context "when documents exist in application but not in database" do
 
       before do
         person.posts.build
@@ -2160,6 +2406,65 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       it "returns false" do
         expect(person.posts.exists?).to be false
       end
+
+      context 'when association is not loaded' do
+        it 'queries database on each call' do
+          expect_query(1) do
+            person.posts.exists?.should be false
+          end
+
+          expect_query(1) do
+            person.posts.exists?.should be false
+          end
+        end
+      end
+
+      context 'when association is loaded' do
+        it 'queries database on each call' do
+          expect_query(1) do
+            person.posts.exists?.should be false
+          end
+
+          person.posts.to_a
+
+          expect_query(1) do
+            person.posts.exists?.should be false
+          end
+        end
+      end
+    end
+
+    context "when no documents exist" do
+
+      it "returns false" do
+        expect(person.posts.exists?).to be false
+      end
+
+      context 'when association is not loaded' do
+        it 'queries database on each call' do
+          expect_query(1) do
+            person.posts.exists?.should be false
+          end
+
+          expect_query(1) do
+            person.posts.exists?.should be false
+          end
+        end
+      end
+
+      context 'when association is loaded' do
+        it 'queries database on each call' do
+          expect_query(1) do
+            person.posts.exists?.should be false
+          end
+
+          person.posts.to_a
+
+          expect_query(1) do
+            person.posts.exists?.should be false
+          end
+        end
+      end
     end
   end
 
@@ -2186,18 +2491,18 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       end
     end
 
-    context "when the relation is not polymorphic" do
+    context "when the association is not polymorphic" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:post_one) do
-        person.posts.create(title: "Test")
+        person.posts.create!(title: "Test")
       end
 
       let!(:post_two) do
-        person.posts.create(title: "OMG I has relations")
+        person.posts.create!(title: "OMG I has associations")
       end
 
       context "when providing an id" do
@@ -2213,48 +2518,38 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           end
         end
 
-        context "when the id matches but is not scoped to the relation" do
+        context "when the id matches but is not scoped to the association" do
 
           let(:post) do
-            Post.create(title: "Unscoped")
+            Post.create!(title: "Unscoped")
           end
 
           it "raises an error" do
             expect {
               person.posts.find(post.id)
-            }.to raise_error(Mongoid::Errors::DocumentNotFound)
+            }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Post with id\(s\)/)
           end
         end
 
         context "when the id does not match" do
 
           context "when config set to raise error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             it "raises an error" do
               expect {
                 person.posts.find(BSON::ObjectId.new)
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Post with id\(s\)/)
             end
           end
 
           context "when config set not to raise error" do
+            config_override :raise_not_found_error, false
 
             let(:post) do
               person.posts.find(BSON::ObjectId.new)
             end
 
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
-
             it "returns nil" do
               expect(post).to be_nil
             end
@@ -2278,32 +2573,22 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when the ids do not match" do
 
           context "when config set to raise error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             it "raises an error" do
               expect {
                 person.posts.find([ BSON::ObjectId.new ])
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Post with id\(s\)/)
             end
           end
 
           context "when config set not to raise error" do
+            config_override :raise_not_found_error, false
 
             let(:posts) do
               person.posts.find([ BSON::ObjectId.new ])
             end
 
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
-
             it "returns an empty array" do
               expect(posts).to be_empty
             end
@@ -2312,18 +2597,18 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       end
     end
 
-    context "when the relation is polymorphic" do
+    context "when the association is polymorphic" do
 
       let(:movie) do
-        Movie.create
+        Movie.create!
       end
 
       let!(:rating_one) do
-        movie.ratings.create(value: 1)
+        movie.ratings.create!(value: 1)
       end
 
       let!(:rating_two) do
-        movie.ratings.create(value: 5)
+        movie.ratings.create!(value: 5)
       end
 
       context "when providing an id" do
@@ -2342,32 +2627,22 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when the id does not match" do
 
           context "when config set to raise error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             it "raises an error" do
               expect {
                 movie.ratings.find(BSON::ObjectId.new)
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Rating with id\(s\)/)
             end
           end
 
           context "when config set not to raise error" do
+            config_override :raise_not_found_error, false
 
             let(:rating) do
               movie.ratings.find(BSON::ObjectId.new)
             end
 
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
-
             it "returns nil" do
               expect(rating).to be_nil
             end
@@ -2399,32 +2674,22 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         context "when the ids do not match" do
 
           context "when config set to raise error" do
-
-            before do
-              Mongoid.raise_not_found_error = true
-            end
+            config_override :raise_not_found_error, true
 
             it "raises an error" do
               expect {
                 movie.ratings.find([ BSON::ObjectId.new ])
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Rating with id\(s\)/)
             end
           end
 
           context "when config set not to raise error" do
+            config_override :raise_not_found_error, false
 
             let(:ratings) do
               movie.ratings.find([ BSON::ObjectId.new ])
             end
 
-            before do
-              Mongoid.raise_not_found_error = false
-            end
-
-            after do
-              Mongoid.raise_not_found_error = true
-            end
-
             it "returns an empty array" do
               expect(ratings).to be_empty
             end
@@ -2432,18 +2697,56 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         end
       end
     end
+
+    context "with block" do
+      let!(:author) do
+        Person.create!(title: 'Person')
+      end
+
+      let!(:post_one) do
+        author.posts.create!(title: 'post one')
+      end
+
+      let!(:post_two) do
+        author.posts.create!(title: 'post two')
+      end
+
+      it "finds one" do
+        expect(
+          author.posts.find do |post|
+            post.title == 'post one'
+          end
+        ).to be_a(Post)
+      end
+
+      it "returns first match of multiple" do
+        expect(
+          author.posts.find do |post|
+            ['post one', 'post two'].include?(post.title)
+          end
+        ).to eq(post_one)
+      end
+
+      it "returns nil when not found" do
+        expect(
+          author.posts.find do |post|
+            post.title == 'non exiting one'
+          end
+        ).to be_nil
+      end
+    end
   end
 
   describe "#find_or_create_by" do
 
-    context "when the relation is not polymorphic" do
+    context "when the association is not polymorphic" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:post) do
-        person.posts.create(title: "Testing")
+        person.posts.create!(title: "Testing")
       end
 
       context "when the document exists" do
@@ -2456,7 +2759,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           expect(found).to eq(post)
         end
 
-        it "keeps the document in the relation" do
+        it "keeps the document in the association" do
           expect(found.person).to eq(person)
         end
       end
@@ -2483,7 +2786,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             expect(found.content).to eq("The Content")
           end
 
-          it "keeps the document in the relation" do
+          it "keeps the document in the association" do
             expect(found.person).to eq(person)
           end
         end
@@ -2502,21 +2805,21 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             expect(found).to be_persisted
           end
 
-          it "keeps the document in the relation" do
+          it "keeps the document in the association" do
             expect(found.person).to eq(person)
           end
         end
       end
     end
 
-    context "when the relation is polymorphic" do
+    context "when the association is polymorphic" do
 
       let(:movie) do
-        Movie.create
+        Movie.create!
       end
 
       let!(:rating) do
-        movie.ratings.create(value: 1)
+        movie.ratings.create!(value: 1)
       end
 
       context "when the document exists" do
@@ -2529,7 +2832,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           expect(found).to eq(rating)
         end
 
-        it "keeps the document in the relation" do
+        it "keeps the document in the association" do
           expect(found.ratable).to eq(movie)
         end
       end
@@ -2548,7 +2851,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           expect(found).to be_persisted
         end
 
-        it "keeps the document in the relation" do
+        it "keeps the document in the association" do
           expect(found.ratable).to eq(movie)
         end
       end
@@ -2557,14 +2860,14 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
 
   describe "#find_or_create_by!" do
 
-    context "when the relation is not polymorphic" do
+    context "when the association is not polymorphic" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:post) do
-        person.posts.create(title: "Testing")
+        person.posts.create!(title: "Testing")
       end
 
       context "when the document exists" do
@@ -2577,7 +2880,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           expect(found).to eq(post)
         end
 
-        it "keeps the document in the relation" do
+        it "keeps the document in the association" do
           expect(found.person).to eq(person)
         end
       end
@@ -2604,7 +2907,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             expect(found.content).to eq("The Content")
           end
 
-          it "keeps the document in the relation" do
+          it "keeps the document in the association" do
             expect(found.person).to eq(person)
           end
         end
@@ -2623,21 +2926,21 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             expect(found).to be_persisted
           end
 
-          it "keeps the document in the relation" do
+          it "keeps the document in the association" do
             expect(found.person).to eq(person)
           end
         end
       end
     end
 
-    context "when the relation is polymorphic" do
+    context "when the association is polymorphic" do
 
       let(:movie) do
-        Movie.create
+        Movie.create!
       end
 
       let!(:rating) do
-        movie.ratings.create(value: 1)
+        movie.ratings.create!(value: 1)
       end
 
       context "when the document exists" do
@@ -2650,7 +2953,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           expect(found).to eq(rating)
         end
 
-        it "keeps the document in the relation" do
+        it "keeps the document in the association" do
           expect(found.ratable).to eq(movie)
         end
       end
@@ -2669,7 +2972,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           expect(found).to be_persisted
         end
 
-        it "keeps the document in the relation" do
+        it "keeps the document in the association" do
           expect(found.ratable).to eq(movie)
         end
 
@@ -2687,14 +2990,14 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
 
   describe "#find_or_initialize_by" do
 
-    context "when the relation is not polymorphic" do
+    context "when the association is not polymorphic" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:post) do
-        person.posts.create(title: "Testing")
+        person.posts.create!(title: "Testing")
       end
 
       context "when the document exists" do
@@ -2730,14 +3033,14 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       end
     end
 
-    context "when the relation is polymorphic" do
+    context "when the association is polymorphic" do
 
       let(:movie) do
-        Movie.create
+        Movie.create!
       end
 
       let!(:rating) do
-        movie.ratings.create(value: 1)
+        movie.ratings.create!(value: 1)
       end
 
       context "when the document exists" do
@@ -2770,7 +3073,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
 
   describe "#initialize" do
 
-    context "when an illegal mixed relation exists" do
+    context "when an illegal mixed association exists" do
 
       let(:post) do
         Post.new
@@ -2783,7 +3086,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       end
     end
 
-    context "when a cyclic relation exists" do
+    context "when a cyclic association exists" do
 
       let(:post) do
         Post.new
@@ -2827,15 +3130,15 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
   describe "#max" do
 
     let(:person) do
-      Person.create
+      Person.create!
     end
 
     let(:post_one) do
-      Post.create(rating: 5)
+      Post.create!(rating: 5)
     end
 
     let(:post_two) do
-      Post.create(rating: 10)
+      Post.create!(rating: 10)
     end
 
     before do
@@ -2856,15 +3159,15 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
   describe "#max_by" do
 
     let(:person) do
-      Person.create
+      Person.create!
     end
 
     let(:post_one) do
-      Post.create(rating: 5)
+      Post.create!(rating: 5)
     end
 
     let(:post_two) do
-      Post.create(rating: 10)
+      Post.create!(rating: 10)
     end
 
     before do
@@ -2883,15 +3186,15 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
   describe "#method_missing" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let!(:post_one) do
-      person.posts.create(title: "First", content: "Posting")
+      person.posts.create!(title: "First", content: "Posting")
     end
 
     let!(:post_two) do
-      person.posts.create(title: "Second", content: "Testing")
+      person.posts.create!(title: "Second", content: "Testing")
     end
 
     context "when providing a single criteria" do
@@ -2904,7 +3207,8 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         expect(posts).to eq([ post_one ])
       end
 
-      context 'when providing a collation', if: collation_supported? do
+      context 'when providing a collation' do
+        min_server_version '3.4'
 
         let(:posts) do
           person.posts.where(title: "FIRST").collation(locale: 'en_US', strength: 2)
@@ -2957,15 +3261,15 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
   describe "#min" do
 
     let(:person) do
-      Person.create
+      Person.create!
     end
 
     let(:post_one) do
-      Post.create(rating: 5)
+      Post.create!(rating: 5)
     end
 
     let(:post_two) do
-      Post.create(rating: 10)
+      Post.create!(rating: 10)
     end
 
     before do
@@ -2986,15 +3290,15 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
   describe "#min_by" do
 
     let(:person) do
-      Person.create
+      Person.create!
     end
 
     let(:post_one) do
-      Post.create(rating: 5)
+      Post.create!(rating: 5)
     end
 
     let(:post_two) do
-      Post.create(rating: 10)
+      Post.create!(rating: 10)
     end
 
     before do
@@ -3015,15 +3319,15 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
     context "when the inverse has not been loaded" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:post_one) do
-        person.posts.create(title: "One")
+        person.posts.create!(title: "One")
       end
 
       let!(:post_two) do
-        person.posts.create(title: "Two")
+        person.posts.create!(title: "Two")
       end
 
       let(:from_db) do
@@ -3049,18 +3353,18 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       end
     end
 
-    context "when the relation is not polymorphic" do
+    context "when the association is not polymorphic" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:post_one) do
-        person.posts.create(title: "One")
+        person.posts.create!(title: "One")
       end
 
       let!(:post_two) do
-        person.posts.create(title: "Two")
+        person.posts.create!(title: "Two")
       end
 
       before do
@@ -3083,30 +3387,30 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         expect(post_one.reload.person).to be_nil
       end
 
-      context "when adding a nullified document back to the relation" do
+      context "when adding a nullified document back to the association" do
 
         before do
           person.posts.push(post_one)
         end
 
-        it "persists the relation" do
+        it "persists the association" do
           expect(person.posts(true)).to eq([ post_one ])
         end
       end
     end
 
-    context "when the relation is polymorphic" do
+    context "when the association is polymorphic" do
 
       let(:movie) do
-        Movie.create(title: "Oldboy")
+        Movie.create!(title: "Oldboy")
       end
 
       let!(:rating_one) do
-        movie.ratings.create(value: 10)
+        movie.ratings.create!(value: 10)
       end
 
       let!(:rating_two) do
-        movie.ratings.create(value: 9)
+        movie.ratings.create!(value: 9)
       end
 
       before do
@@ -3178,7 +3482,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       person.posts.scoped
     end
 
-    it "returns the relation criteria" do
+    it "returns the association criteria" do
       expect(scoped).to be_a(Mongoid::Criteria)
     end
 
@@ -3192,13 +3496,13 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
     describe "##{method}" do
 
       let(:movie) do
-        Movie.create
+        Movie.create!
       end
 
       context "when documents have been persisted" do
 
         let!(:rating) do
-          movie.ratings.create(value: 1)
+          movie.ratings.create!(value: 1)
         end
 
         it "returns 1" do
@@ -3210,7 +3514,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
 
         before do
           movie.ratings.build(value: 1)
-          movie.ratings.create(value: 2)
+          movie.ratings.create!(value: 2)
         end
 
         it "returns the total number of documents" do
@@ -3222,18 +3526,18 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
 
   describe "#unscoped" do
 
-    context "when the relation has no default scope" do
+    context "when the association has no default scope" do
 
       let!(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:post_one) do
-        person.posts.create(title: "first")
+        person.posts.create!(title: "first")
       end
 
       let!(:post_two) do
-        Post.create(title: "second")
+        Post.create!(title: "second")
       end
 
       let(:unscoped) do
@@ -3245,18 +3549,18 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       end
     end
 
-    context "when the relation has a default scope" do
+    context "when the association has a default scope" do
 
       let!(:church) do
-        Church.create
+        Church.create!
       end
 
       let!(:acolyte_one) do
-        church.acolytes.create(name: "first")
+        church.acolytes.create!(name: "first")
       end
 
       let!(:acolyte_two) do
-        Acolyte.create(name: "second")
+        Acolyte.create!(name: "second")
       end
 
       let(:unscoped) do
@@ -3276,19 +3580,19 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
   context "when the association has an order defined" do
 
     let(:person) do
-      Person.create
+      Person.create!
     end
 
     let(:post_one) do
-      OrderedPost.create(rating: 10, title: '1')
+      OrderedPost.create!(rating: 10, title: '1')
     end
 
     let(:post_two) do
-      OrderedPost.create(rating: 20, title: '2')
+      OrderedPost.create!(rating: 20, title: '2')
     end
 
     let(:post_three) do
-      OrderedPost.create(rating: 20, title: '3')
+      OrderedPost.create!(rating: 20, title: '3')
     end
 
     before do
@@ -3302,32 +3606,32 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
                                             )
     end
 
-    it "chaining order criterias" do
+    it "chaining order criteria" do
       expect(person.ordered_posts.order_by(:title.desc).to_a).to eq(
                                                                      [post_three, post_two, post_one]
                                                                  )
     end
   end
 
-  context "when reloading the relation" do
+  context "when reloading the association" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let!(:post_one) do
-      Post.create(title: "one")
+      Post.create!(title: "one")
     end
 
     let!(:post_two) do
-      Post.create(title: "two")
+      Post.create!(title: "two")
     end
 
     before do
       person.posts << post_one
     end
 
-    context "when the relation references the same documents" do
+    context "when the association references the same documents" do
 
       before do
         Post.collection.find({ _id: post_one.id }).
@@ -3343,7 +3647,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       end
     end
 
-    context "when the relation references different documents" do
+    context "when the association references different documents" do
 
       before do
         person.posts << post_two
@@ -3366,7 +3670,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
   context "when the parent is using integer ids" do
 
     let(:jar) do
-      Jar.create do |doc|
+      Jar.create! do |doc|
         doc._id = 1
       end
     end
@@ -3430,7 +3734,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         expect(album.before_add_called).to be true
       end
 
-      it "adds the document to the relation" do
+      it "adds the document to the association" do
         expect(artist.albums).to eq([ album ])
       end
     end
@@ -3442,7 +3746,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         begin; artist.albums << album; rescue; end
       end
 
-      it "does not add the document to the relation" do
+      it "does not add the document to the association" do
         expect(artist.albums).to be_empty
       end
     end
@@ -3470,17 +3774,17 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         begin; artist.albums << album; rescue; end
       end
 
-      it "adds the document to the relation" do
+      it "adds the document to the association" do
         expect(artist.albums).to eq([ album ])
       end
     end
 
-    context 'when the relation already exists' do
+    context 'when the association already exists' do
 
       before do
         artist.albums << album
-        album.save
-        artist.save
+        album.save!
+        artist.save!
         expect(artist).not_to receive(:after_add_album)
       end
 
@@ -3488,7 +3792,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         Album.where(artist_id: artist.id).first
       end
 
-      it 'does not execute the callback when the relation is accessed' do
+      it 'does not execute the callback when the association is accessed' do
         expect(reloaded_album.artist.after_add_referenced_called).to be(nil)
       end
     end
@@ -3520,7 +3824,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           expect(artist.before_remove_referenced_called).to be true
         end
 
-        it "removes the document from the relation" do
+        it "removes the document from the association" do
           expect(artist.albums).to be_empty
         end
       end
@@ -3535,7 +3839,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           expect(artist.before_remove_referenced_called).to be true
         end
 
-        it "clears the relation" do
+        it "clears the association" do
           expect(artist.albums).to be_empty
         end
       end
@@ -3552,7 +3856,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             begin; artist.albums.delete(album); rescue; end
           end
 
-          it "does not remove the document from the relation" do
+          it "does not remove the document from the association" do
             expect(artist.albums).to eq([ album ])
           end
         end
@@ -3563,7 +3867,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             begin; artist.albums.clear; rescue; end
           end
 
-          it "does not clear the relation" do
+          it "does not clear the association" do
             expect(artist.albums).to eq([ album ])
           end
         end
@@ -3623,7 +3927,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           begin; artist.albums.delete(album); rescue; end
         end
 
-        it "removes the documents from the relation" do
+        it "removes the documents from the association" do
           expect(artist.albums).to be_empty
         end
       end
@@ -3634,25 +3938,25 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           begin; artist.albums.clear; rescue; end
         end
 
-        it "removes the documents from the relation" do
+        it "removes the documents from the association" do
           expect(artist.albums).to be_empty
         end
       end
     end
   end
 
-  context "when executing a criteria call on an ordered relation" do
+  context "when executing a criteria call on an ordered association" do
 
     let(:person) do
-      Person.create
+      Person.create!
     end
 
     let!(:post_one) do
-      person.ordered_posts.create(rating: 1)
+      person.ordered_posts.create!(rating: 1)
     end
 
     let!(:post_two) do
-      person.ordered_posts.create(rating: 5)
+      person.ordered_posts.create!(rating: 5)
     end
 
     let(:criteria) do
@@ -3667,11 +3971,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
   context "when accessing a scope named open" do
 
     let(:person) do
-      Person.create
+      Person.create!
     end
 
     let!(:post) do
-      person.posts.create(title: "open")
+      person.posts.create!(title: "open")
     end
 
     it "returns the appropriate documents" do
@@ -3679,18 +3983,18 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
     end
   end
 
-  context "when accessing a relation named parent" do
+  context "when accessing a association named parent" do
 
     let!(:parent) do
-      Odd.create(name: "odd parent")
+      Odd.create!(name: "odd parent")
     end
 
     let(:child) do
-      Even.create(parent_id: parent.id, name: "original even child")
+      Even.create!(parent_id: parent.id, name: "original even child")
     end
 
     it "updates the child after accessing the parent" do
-      # Access parent relation on the child to make sure it is loaded
+      # Access parent association on the child to make sure it is loaded
       child.parent
 
       new_child_name = "updated even child"
@@ -3703,7 +4007,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
     end
   end
 
-  context 'when a document has referenced and embedded relations' do
+  context 'when a document has referenced and embedded associations' do
 
     let(:agent) do
       Agent.new
@@ -3723,11 +4027,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
     end
 
     it 'saves the document correctly' do
-      expect(agent.save).to be(true)
+      expect(agent.save!).to be(true)
     end
   end
 
-  context 'when the two models use the same name to refer to the relation' do
+  context 'when the two models use the same name to refer to the association' do
 
     let(:agent) do
       Agent.new
@@ -3739,8 +4043,8 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
 
     before do
       agent.same_name = band
-      agent.save
-      band.save
+      agent.save!
+      band.save!
       band.reload
     end
 
@@ -3748,4 +4052,57 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       expect(band.same_name).to eq([agent])
     end
   end
+
+  context "when removing a document with counter_cache on" do
+    let(:post) { Post.create! }
+    let(:person1) { Person.create! }
+    let(:person2) { Person.create! }
+
+    before do
+      post.update_attribute(:person, person1)
+      expect(person1.posts_count).to eq 1
+
+      person2
+      post.update_attribute(:person, person2)
+      person1.reload
+      expect(person1.posts_count).to eq 0
+      expect(person2.posts_count).to eq 1
+
+      post.update_attribute(:person, nil)
+      person1.reload
+      person2.reload
+    end
+
+    it "the count field is updated" do
+      expect(person2.posts_count).to eq 0
+    end
+  end
+
+  context "when there is a foreign key in the aliased associations" do
+    it "has the correct aliases" do
+      expect(Band.aliased_associations["artist_ids"]).to eq("artists")
+      expect(Artist.aliased_associations.key?("band_id")).to be false
+      expect(Artist.aliased_fields["band"]).to eq("band_id")
+    end
+  end
+
+  context "when executing concat on foreign key array from the db" do
+    config_override :legacy_attributes, false
+
+    before do
+      Agent.create!
+      Basic.create!
+    end
+
+    let!(:agent) { Agent.first }
+    let!(:basic) { Basic.first }
+
+    before do
+      agent.basic_ids.concat([basic.id])
+    end
+
+    it "works on the first attempt" do
+      expect(agent.basic_ids).to eq([basic.id])
+    end
+  end
 end