mongoid 5.4.1 → 6.1.1

data/spec/mongoid/relations/metadata_spec.rb

@@ -1896,6 +1896,21 @@ describe Mongoid::Relations::Metadata do
       end
     end
 
+    context "when touch specifies additional field" do
+
+      let(:metadata) do
+        described_class.new(
+          name: :versions,
+          relation: Mongoid::Relations::Referenced::In,
+          touch: :changed_at
+        )
+      end
+
+      it "returns true" do
+        expect(metadata).to be_touchable
+      end
+    end
+
     context "when touch is nil" do
 
       let(:metadata) do
@@ -1967,5 +1982,4 @@ describe Mongoid::Relations::Metadata do
       end
     end
   end
-
 end

data/spec/mongoid/relations/proxy_spec.rb

@@ -19,7 +19,9 @@ describe Mongoid::Relations::Proxy do
 
     it 'uses the new persistence options' do
       expect {
-        animal.with(write: { w: 100 }).update_attribute(:name, 'kangaroo')
+        animal.with(write: { w: 100 }) do |an|
+          an.update_attribute(:name, 'kangaroo')
+        end
       }.to raise_exception(Mongo::Error::OperationFailure)
     end
   end
@@ -95,4 +97,28 @@ describe Mongoid::Relations::Proxy do
       end
     end
   end
+
+  describe "equality" do
+    let(:messages) do
+      Person.create.messages
+    end
+
+    it "is #equal? to itself" do
+      expect(messages.equal?(messages)).to eq(true)
+    end
+
+    it "is == to itself" do
+      expect(messages == messages).to eq(true)
+    end
+
+    it "is not #equal? to its target" do
+      expect(messages.equal?(messages.target)).to eq(false)
+      expect(messages.target.equal?(messages)).to eq(false)
+    end
+
+    it "is == to its target" do
+      expect(messages == messages.target).to eq(true)
+      expect(messages.target == messages).to eq(true)
+    end
+  end
 end

data/spec/mongoid/relations/referenced/in_spec.rb

@@ -264,6 +264,44 @@ describe Mongoid::Relations::Referenced::In do
 
       context "when the relation is not polymorphic" do
 
+        context 'when the child has persistence options set' do
+
+          let(:person) do
+            Person.new
+          end
+
+          let(:post) do
+            Post.new
+          end
+
+          before do
+            post.with(collection: 'other-posts') do |p|
+              person.with(collection: 'other-people') do |per|
+                p.person = person
+                per.save
+                p.save
+              end
+            end
+          end
+
+          let(:other_people_count) do
+            Person.with(collection: 'other-people') do |person_class|
+              person_class.count
+            end
+          end
+
+          let(:other_posts_count) do
+            Post.with(collection: 'other-posts') do |post_class|
+              post_class.count
+            end
+          end
+
+          it 'applies the persistence options when saving the child' do
+            expect(other_people_count).to eq(1)
+            expect(other_posts_count).to eq(1)
+          end
+        end
+
         context "when the child is a new record" do
 
           let(:person) do
@@ -1028,7 +1066,9 @@ describe Mongoid::Relations::Referenced::In do
           :index,
           :polymorphic,
           :primary_key,
-          :touch
+          :touch,
+          :optional,
+          :required
         ]
       )
     end

data/spec/mongoid/relations/referenced/many_spec.rb

@@ -2934,16 +2934,16 @@ describe Mongoid::Relations::Referenced::Many do
       it "applies the criteria to the documents" do
         expect(posts).to eq([ post_one ])
       end
-    end
 
-    context 'when providing a collation', if: collation_supported? do
+      context 'when providing a collation', if: collation_supported? do
 
-      let(:posts) do
-        person.posts.where(title: "FIRST").collation(locale: 'en_US', strength: 2)
-      end
+        let(:posts) do
+          person.posts.where(title: "FIRST").collation(locale: 'en_US', strength: 2)
+        end
 
-      it "applies the collation option to the query" do
-        expect(posts).to eq([ post_one ])
+        it "applies the collation option to the query" do
+          expect(posts).to eq([ post_one ])
+        end
       end
     end
 
@@ -3504,12 +3504,10 @@ describe Mongoid::Relations::Referenced::Many do
 
       before do
         expect(artist).to receive(:before_add_album).and_raise
+        begin; artist.albums << album; rescue; end
       end
 
       it "does not add the document to the relation" do
-        expect {
-          artist.albums << album
-        }.to raise_error
         expect(artist.albums).to be_empty
       end
     end
@@ -3534,12 +3532,10 @@ describe Mongoid::Relations::Referenced::Many do
 
       before do
         expect(artist).to receive(:after_add_album).and_raise
+        begin; artist.albums << album; rescue; end
       end
 
       it "adds the document to the relation" do
-        expect {
-          artist.albums << album
-        }.to raise_error
         expect(artist.albums).to eq([ album ])
       end
     end
@@ -3618,9 +3614,7 @@ describe Mongoid::Relations::Referenced::Many do
         describe "#delete" do
 
           before do
-            expect {
-              artist.albums.delete album
-            }.to raise_error
+            begin; artist.albums.delete(album); rescue; end
           end
 
           it "does not remove the document from the relation" do
@@ -3631,9 +3625,7 @@ describe Mongoid::Relations::Referenced::Many do
         describe "#clear" do
 
           before do
-            expect {
-              artist.albums.clear
-            }.to raise_error
+            begin; artist.albums.clear; rescue; end
           end
 
           it "does not clear the relation" do
@@ -3693,9 +3685,7 @@ describe Mongoid::Relations::Referenced::Many do
       describe "#delete" do
 
         before do
-          expect {
-            artist.albums.delete album
-          }.to raise_error
+          begin; artist.albums.delete(album); rescue; end
         end
 
         it "removes the documents from the relation" do
@@ -3706,9 +3696,7 @@ describe Mongoid::Relations::Referenced::Many do
       describe "#clear" do
 
         before do
-          expect {
-            artist.albums.clear
-          }.to raise_error
+          begin; artist.albums.clear; rescue; end
         end
 
         it "removes the documents from the relation" do

data/spec/mongoid/relations/referenced/many_to_many_spec.rb

@@ -5,7 +5,7 @@ describe Mongoid::Relations::Referenced::ManyToMany do
   before(:all) do
     Mongoid.raise_not_found_error = true
     Person.autosave(Person.relations["preferences"].merge!(autosave: true))
-    Person.synced(Person.relations["preferences"])
+    Person._synced(Person.relations["preferences"])
   end
 
   after(:all) do
@@ -516,12 +516,10 @@ describe Mongoid::Relations::Referenced::ManyToMany do
 
             before do
               expect(post).to receive(:before_add_tag).and_raise
+              begin; post.tags.send(method, tag); rescue; end;
             end
 
             it "does not add the document to the relation" do
-              expect {
-                post.tags.send(method, tag)
-              }.to raise_error
               expect(post.tags).to be_empty
             end
           end
@@ -538,12 +536,10 @@ describe Mongoid::Relations::Referenced::ManyToMany do
 
             before do
               expect(post).to receive(:after_add_tag).and_raise
+              begin; post.tags.send(method, tag); rescue; end
             end
 
             it "adds the document to the relation" do
-              expect {
-                post.tags.send(method, tag)
-              }.to raise_error
               expect(post.tags).to eq([ tag ])
             end
           end
@@ -1186,12 +1182,10 @@ describe Mongoid::Relations::Referenced::ManyToMany do
 
           before do
             expect(post).to receive(:before_remove_tag).and_raise
+            begin; post.tags.clear; rescue; end
           end
 
           it "does not remove the document from the relation" do
-            expect {
-              post.tags.clear
-            }.to raise_error
             expect(post.tags).to eq([ tag ])
           end
         end
@@ -1218,12 +1212,10 @@ describe Mongoid::Relations::Referenced::ManyToMany do
 
           before do
             expect(post).to receive(:after_remove_tag).and_raise
+            begin; post.tags.clear; rescue; end
           end
 
           it "removes the document from the relation" do
-            expect {
-              post.tags.clear
-            }.to raise_error
             expect(post.tags).to be_empty
           end
         end
@@ -2120,12 +2112,10 @@ describe Mongoid::Relations::Referenced::ManyToMany do
 
           before do
             expect(post).to receive(:before_remove_tag).and_raise
+            begin; post.tags.delete(tag); rescue; end
           end
 
           it "does not remove the document from the relation" do
-            expect {
-              post.tags.delete tag
-            }.to raise_error
             expect(post.tags).to eq([ tag ])
           end
         end
@@ -2152,12 +2142,10 @@ describe Mongoid::Relations::Referenced::ManyToMany do
 
           before do
             expect(post).to receive(:after_remove_tag).and_raise
+            begin; post.tags.delete(tag); rescue; end
           end
 
           it "removes the document from the relation" do
-            expect {
-              post.tags.delete(tag)
-            }.to raise_error
             expect(post.tags).to be_empty
           end
         end
@@ -2652,16 +2640,16 @@ describe Mongoid::Relations::Referenced::ManyToMany do
       it "applies the criteria to the documents" do
         expect(preferences).to eq([ preference_one ])
       end
-    end
 
-    context 'when providing a collation', if: collation_supported? do
+      context 'when providing a collation', if: collation_supported? do
 
-      let(:preferences) do
-        person.preferences.where(name: "FIRST").collation(locale: 'en_US', strength: 2).to_a
-      end
+        let(:preferences) do
+          person.preferences.where(name: "FIRST").collation(locale: 'en_US', strength: 2).to_a
+        end
 
-      it "applies the collation option to the query" do
-        expect(preferences).to eq([ preference_one ])
+        it "applies the collation option to the query" do
+          expect(preferences).to eq([ preference_one ])
+        end
       end
     end
 

data/spec/mongoid/relations/synchronization_spec.rb

@@ -4,7 +4,7 @@ describe Mongoid::Relations::Synchronization do
 
   before(:all) do
     Mongoid.raise_not_found_error = true
-    Person.synced(Person.relations["preferences"])
+    Person._synced(Person.relations["preferences"])
   end
 
   after(:all) do
@@ -12,6 +12,52 @@ describe Mongoid::Relations::Synchronization do
     Person.reset_callbacks(:destroy)
   end
 
+  describe 'Model loading' do
+
+    let(:model_synced) do
+      class TestModel
+        include Mongoid::Document
+        field :_synced
+      end
+    end
+
+    let(:model_synced?) do
+      class TestModel
+        include Mongoid::Document
+        field :_synced?
+      end
+    end
+    
+    let(:model_syncable?) do
+      class TestModel
+        include Mongoid::Document
+        field :_syncable?
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :TestModel)
+    end
+
+    it 'prohibits the use of :_sycned as an attribute' do
+      expect {
+        model_synced
+      }.to raise_exception(Mongoid::Errors::InvalidField)
+    end
+
+    it 'prohibits the use of :_synced? as an attribute' do
+      expect {
+        model_synced?
+      }.to raise_exception(Mongoid::Errors::InvalidField)
+    end
+
+    it 'prohibits the use of :_syncable? as an attribute' do
+      expect {
+        model_syncable?
+      }.to raise_exception(Mongoid::Errors::InvalidField)
+    end
+  end
+
   describe ".update_inverse_keys" do
 
     let(:agent) do
@@ -119,7 +165,7 @@ describe Mongoid::Relations::Synchronization do
     end
 
     it "resets the synced flag" do
-      expect(person.synced["preference_ids"]).to be false
+      expect(person._synced["preference_ids"]).to be false
     end
 
     context "when subsequently setting with keys" do

data/spec/mongoid/relations/touchable_spec.rb

@@ -227,6 +227,44 @@ describe Mongoid::Relations::Touchable do
         end
       end
 
+      context "when the parent of embedded doc has cascade callbacks" do
+
+        let!(:book) do
+          Book.new
+        end
+
+        before do
+          book.pages.new
+          book.save
+          book.unset(:updated_at)
+          book.pages.first.touch
+        end
+
+        it "touches the parent document" do
+          expect(book.updated_at).to be_within(5).of(Time.now)
+        end
+      end
+
+      context "when multiple embedded docs with cascade callbacks" do
+
+        let!(:book) do
+          Book.new
+        end
+
+        before do
+          2.times { book.pages.new }
+          book.save
+          book.unset(:updated_at)
+          book.pages.first.content  = "foo"
+          book.pages.second.content = "bar"
+          book.pages.first.touch
+        end
+
+        it "touches the parent document" do
+          expect(book.updated_at).to be_within(5).of(Time.now)
+        end
+      end
+
       context "when the relation is nil" do
 
         let!(:agent) do
@@ -343,6 +381,7 @@ describe Mongoid::Relations::Touchable do
         end
 
         it "does not persist other attribute changes" do
+          expect(band.name).to eq('Nocebo')
           expect(band.reload.name).not_to eq('Nocebo')
         end
       end
@@ -354,6 +393,7 @@ describe Mongoid::Relations::Touchable do
         end
 
         it "does not persist other attribute changes" do
+          expect(band.name).to eq('Nocebo')
           expect(band.reload.name).not_to eq('Nocebo')
         end
       end