mongoid 7.1.5 → 7.2.1

data/spec/lite_spec_helper.rb

@@ -3,6 +3,7 @@
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "shared", "lib"))
 
 # Load byebug before mongoid, to place breakpoints in the lib methods.
 # But SpecConfig needs the driver code - require the driver here.
@@ -15,7 +16,7 @@ require "mongo"
 require 'pp'
 
 require 'support/spec_config'
-require 'support/lite_constraints'
+require 'mrss/lite_constraints'
 require "support/session_registry"
 
 unless SpecConfig.instance.ci?
@@ -50,7 +51,7 @@ RSpec.configure do |config|
     config.add_formatter(RSpec::Core::Formatters::JsonFormatter, File.join(File.dirname(__FILE__), '../tmp/rspec.json'))
   end
 
-  if SpecConfig.instance.ci?
+  if SpecConfig.instance.ci? && !%w(1 true yes).include?(ENV['INTERACTIVE']&.downcase)
     timeout = if SpecConfig.instance.app_tests?
       # Allow 5 minutes per test for the app tests, since they install
       # gems for Rails applications which can take a long time.
@@ -68,7 +69,7 @@ RSpec.configure do |config|
     end
   end
 
-  config.extend(LiteConstraints)
+  config.extend(Mrss::LiteConstraints)
 end
 
 # require all shared examples

data/spec/mongoid/association/depending_spec.rb

@@ -489,7 +489,7 @@ describe Mongoid::Association::Depending do
           end
         end
 
-        context "when dependent is restrict_with_error" do
+        context "when dependent is restrict_with_exception" do
 
           context "when restricting a references many" do
 
@@ -825,44 +825,96 @@ describe Mongoid::Association::Depending do
 
   context 'when the strategy is :restrict_with_error' do
 
-    let(:person) do
-      Person.new
-    end
+    context "when restricting a one-to-many" do
+      
+      let(:person) do
+        Person.new
+      end
+  
+      let(:post) do
+        Post.new
+      end
 
-    let(:post) do
-      Post.new
-    end
+      let!(:association) do
+        Person.has_many :restrictable_posts, class_name: "Post", dependent: :restrict_with_error
+      end
 
-    let!(:association) do
-      Person.has_many :restrictable_posts, class_name: "Post", dependent: :restrict_with_error
-    end
+      after do
+        Person.dependents.delete(association)
+      end
 
-    after do
-      Person.dependents.delete(association)
-    end
+      context 'when there are related objects' do
 
-    context 'when there are related objects' do
+        before do
+          person.restrictable_posts << post
+        end
 
-      before do
-        person.restrictable_posts << post
+        it 'adds an error to the parent object' do
+          expect(person.delete).to be(false)
+  
+          person.errors[:restrictable_posts].first.should ==
+            "is not empty and prevents the document from being destroyed"
+        end
       end
 
-      it 'adds an error to the parent object' do
-        expect(person.delete).to be(false)
-        expect(person.errors[:restrictable_posts].first).to be(
-          Mongoid::Association::Depending::RESTRICT_ERROR_MSG)
+      context 'when there are no related objects' do
+
+        before do
+          expect(post).to receive(:delete).never
+          expect(post).to receive(:destroy).never
+        end
+
+        it 'deletes the object and leaves the other one intact' do
+          expect(person.delete).to be(true)
+        end
+      end
+
+      context 'when deleted inside a transaction' do
+        require_transaction_support
+        
+        before do
+          person.restrictable_posts << post
+        end
+
+        it 'doesn\'t raise an exception' do
+          person.with_session do |session|
+            session.with_transaction do 
+              expect { person.destroy }.to_not raise_error
+            end
+          end
+        end
       end
     end
 
-    context 'when there are no related objects' do
+    context "when restricting a many to many" do
 
-      before do
-        expect(post).to receive(:delete).never
-        expect(post).to receive(:destroy).never
+      let!(:association) do
+        Person.has_and_belongs_to_many :houses, dependent: :restrict_with_error
       end
 
-      it 'deletes the object and leaves the other one intact' do
-        expect(person.delete).to be(true)
+      after do
+        Person.dependents.delete(association)
+        Person.has_and_belongs_to_many :houses, validate: false
+      end
+
+      let(:person) do
+        Person.new houses: [House.new]
+      end
+
+      it "returns false" do
+        expect(person.destroy).to be false
+      end
+
+      context "when inside a transaction" do
+        require_transaction_support
+        
+        it 'doesn\'t raise an exception inside a transaction' do
+          person.with_session do |session|
+            session.with_transaction do
+              expect { person.destroy }.to_not raise_error
+            end
+          end
+        end
       end
     end
   end

data/spec/mongoid/association/embedded/embedded_in/proxy_spec.rb

@@ -507,4 +507,54 @@ describe Mongoid::Association::Embedded::EmbeddedIn::Proxy do
       end
     end
   end
+
+  context "when the same class is embedded multiple times" do
+
+    let(:customer) do
+      Customer.new
+    end
+
+    context "assignment after saving" do
+
+      it "correctly sets the association for the embedded class" do
+        pending 'MONGOID-5039'
+
+        customer.home_address = CustomerAddress.new
+        customer.work_address = CustomerAddress.new
+
+        expect(customer.home_address._association.store_as).to eq("home_address")
+        expect(customer.work_address._association.store_as).to eq("work_address")
+
+        expect(customer.home_address.instance_eval { _association.store_as }).to eq("home_address")
+        expect(customer.work_address.instance_eval { _association.store_as }).to eq("work_address")
+
+        customer.save!
+
+        customer.home_address = CustomerAddress.new
+        customer.work_address = CustomerAddress.new
+
+        expect(customer.home_address._association.store_as).to eq("home_address")
+        expect(customer.work_address._association.store_as).to eq("work_address")
+
+        expect(customer.home_address.instance_eval { _association.store_as }).to eq("home_address")
+        expect(customer.work_address.instance_eval { _association.store_as }).to eq("work_address")
+      end
+    end
+
+    context "inverse assignment" do
+
+      it "correctly sets the association for the embedded class" do
+        pending 'MONGOID-5039'
+
+        customer.work_address = CustomerAddress.new
+        customer.work_address.addressable = customer
+
+        expect(customer.home_address._association.store_as).to eq("home_address")
+        expect(customer.work_address._association.store_as).to eq("work_address")
+
+        expect(customer.home_address.instance_eval { _association.store_as }).to eq("home_address")
+        expect(customer.work_address.instance_eval { _association.store_as }).to eq("work_address")
+      end
+    end
+  end
 end

data/spec/mongoid/association/embedded/embeds_many/proxy_spec.rb

@@ -1402,6 +1402,39 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
     end
   end
 
+  describe "#any?" do
+
+    let(:person) do
+      Person.create
+    end
+
+    context "when documents are persisted" do
+      before do
+        person.addresses.create(street: "Upper")
+      end
+
+      it "returns true" do
+        expect(person.addresses.any?).to be true
+      end
+    end
+    
+    context "when documents are not persisted" do
+      before do
+        person.addresses.build(street: "Bond")
+      end
+      
+      it "returns true" do
+        expect(person.addresses.any?).to be true
+      end
+    end
+
+    context "when documents are not created" do
+      it "returns false" do
+        expect(person.addresses.any?).to be false
+      end
+    end
+  end
+
   describe "#create" do
 
     context "when providing multiple attributes" do

data/spec/mongoid/association/embedded/embeds_many_models.rb

@@ -3,6 +3,7 @@
 
 class EmmCongress
   include Mongoid::Document
+  include Mongoid::Timestamps
 
   embeds_many :legislators, class_name: 'EmmLegislator'
 

data/spec/mongoid/association/embedded/embeds_one_models.rb

@@ -3,6 +3,7 @@
 
 class EomParent
   include Mongoid::Document
+  include Mongoid::Timestamps
 
   embeds_one :child, class_name: 'EomChild'
 

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

@@ -31,16 +31,16 @@ describe Mongoid::Association::Referenced::HasMany::Proxy 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
 
@@ -58,15 +58,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
 
@@ -78,7 +78,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
@@ -93,15 +93,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
 
@@ -120,7 +120,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
                 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
@@ -139,11 +139,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             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
 
@@ -174,15 +174,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
 
@@ -203,7 +203,7 @@ 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
@@ -232,7 +232,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")
@@ -242,15 +242,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
 
@@ -277,7 +277,7 @@ 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
@@ -293,7 +293,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
@@ -318,7 +318,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
 
@@ -334,11 +334,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
 
@@ -365,11 +365,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
 
@@ -387,7 +387,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
 
@@ -403,15 +403,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
 
@@ -434,15 +434,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
 
@@ -450,7 +450,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
 
@@ -458,11 +458,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
@@ -477,11 +477,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
@@ -499,7 +499,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
 
@@ -511,7 +511,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
@@ -526,11 +526,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
@@ -548,11 +548,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
@@ -567,11 +567,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
@@ -579,7 +579,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
 
@@ -595,15 +595,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
 
@@ -626,15 +626,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
 
@@ -676,7 +676,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
 
@@ -693,11 +693,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
 
@@ -723,11 +723,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
 
@@ -751,11 +751,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
 
@@ -763,14 +763,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
 
@@ -787,11 +787,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
 
@@ -815,11 +815,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
 
@@ -870,7 +870,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       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
@@ -879,7 +879,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
 
     describe "##{method}" 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
 
@@ -891,11 +891,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
 
@@ -930,11 +930,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy 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
 
@@ -952,7 +952,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 subclass" do
 
@@ -983,11 +983,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
 
@@ -1018,11 +1018,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy 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
 
@@ -1044,7 +1044,7 @@ 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
 
@@ -1058,11 +1058,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             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
 
@@ -1074,8 +1074,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
 
@@ -1085,11 +1085,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
@@ -1105,17 +1105,17 @@ 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
 
@@ -1129,11 +1129,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             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
 
@@ -1145,8 +1145,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
 
@@ -1156,11 +1156,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
@@ -1176,11 +1176,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
@@ -1189,7 +1189,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
 
@@ -1205,15 +1205,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
 
@@ -1238,11 +1238,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           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
 
@@ -1277,15 +1277,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
 
@@ -1297,7 +1297,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")
@@ -1307,15 +1307,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
 
@@ -1339,7 +1339,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
 
@@ -1355,11 +1355,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
 
@@ -1386,11 +1386,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
 
@@ -1432,9 +1432,16 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       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)
@@ -1445,7 +1452,7 @@ 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
@@ -1458,6 +1465,188 @@ 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
+        it 'queries database on each call' do
+          expect_query(1) do
+            movie.ratings.any?.should be true
+          end
+
+          expect_query(1) do
+            movie.ratings.any?.should be true
+          end
+        end
+      end
+
+      context 'when association is loaded' do
+        it 'does not query database' do
+          expect_query(1) 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
@@ -1487,7 +1676,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
 
@@ -1553,11 +1742,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           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
 
@@ -1606,7 +1795,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
 
@@ -1633,11 +1822,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
           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
 
@@ -1700,7 +1889,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
 
@@ -1727,11 +1916,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy 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
 
@@ -1758,7 +1947,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
 
@@ -1785,11 +1974,11 @@ describe Mongoid::Association::Referenced::HasMany::Proxy 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
 
@@ -1823,7 +2012,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"]
@@ -1843,7 +2032,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"]
@@ -1914,7 +2103,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             expect(drug.person_id).to be_nil
           end
 
-          it "removes the document from the relation" do
+          it "removes the document from the association" do
             expect(person.drugs).to_not include(drug)
           end
         end
@@ -1937,7 +2126,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             expect(drug.person_id).to be_nil
           end
 
-          it "removes the document from the relation" do
+          it "removes the document from the association" do
             expect(person.drugs).to_not include(drug)
           end
         end
@@ -1963,7 +2152,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             expect(post).to be_destroyed
           end
 
-          it "removes the document from the relation" do
+          it "removes the document from the association" do
             expect(person.posts).to_not include(post)
           end
         end
@@ -1986,7 +2175,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
             expect(post).to be_destroyed
           end
 
-          it "removes the document from the relation" do
+          it "removes the document from the association" do
             expect(person.posts).to_not include(post)
           end
         end
@@ -2017,7 +2206,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
 
     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
 
@@ -2073,7 +2262,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 conditions are provided" do
 
@@ -2152,9 +2341,35 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       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
@@ -2163,6 +2378,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
 
@@ -2189,7 +2463,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(:person) do
         Person.create
@@ -2200,7 +2474,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
       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
@@ -2216,7 +2490,7 @@ 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")
@@ -2315,7 +2589,7 @@ 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
@@ -2439,7 +2713,7 @@ 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
@@ -2459,7 +2733,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
@@ -2486,7 +2760,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
@@ -2505,14 +2779,14 @@ 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
@@ -2532,7 +2806,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
@@ -2551,7 +2825,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
@@ -2560,7 +2834,7 @@ 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
@@ -2580,7 +2854,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
@@ -2607,7 +2881,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
@@ -2626,14 +2900,14 @@ 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
@@ -2653,7 +2927,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
@@ -2672,7 +2946,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
 
@@ -2690,7 +2964,7 @@ 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
@@ -2733,7 +3007,7 @@ 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
@@ -2773,7 +3047,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
@@ -2786,7 +3060,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
@@ -3053,7 +3327,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(:person) do
         Person.create
@@ -3087,19 +3361,19 @@ 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")
@@ -3182,7 +3456,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
 
@@ -3226,7 +3500,7 @@ 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
@@ -3249,7 +3523,7 @@ 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
@@ -3313,7 +3587,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
     end
   end
 
-  context "when reloading the relation" do
+  context "when reloading the association" do
 
     let!(:person) do
       Person.create
@@ -3331,7 +3605,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy 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 }).
@@ -3347,7 +3621,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
@@ -3434,7 +3708,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
@@ -3446,7 +3720,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
@@ -3474,12 +3748,12 @@ 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
@@ -3492,7 +3766,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
@@ -3524,7 +3798,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
@@ -3539,7 +3813,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
@@ -3556,7 +3830,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
@@ -3567,7 +3841,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
@@ -3627,7 +3901,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
@@ -3638,14 +3912,14 @@ 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
@@ -3683,7 +3957,7 @@ 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")
@@ -3694,7 +3968,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
     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"
@@ -3707,7 +3981,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
@@ -3731,7 +4005,7 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
     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