mongoid 5.4.0 → 6.4.8

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
@@ -3803,4 +3791,26 @@ describe Mongoid::Relations::Referenced::Many do
       expect(agent.save).to be(true)
     end
   end
+
+  context 'when the two models use the same name to refer to the relation' do
+
+    let(:agent) do
+      Agent.new
+    end
+
+    let(:band) do
+      Band.new
+    end
+
+    before do
+      agent.same_name = band
+      agent.save
+      band.save
+      band.reload
+    end
+
+    it 'constructs the correct criteria' do
+      expect(band.same_name).to eq([agent])
+    end
+  end
 end

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/targets/enumerable_spec.rb

@@ -928,6 +928,60 @@ describe Mongoid::Relations::Targets::Enumerable do
         end
       end
     end
+
+    context 'when the id_sort option is none' do
+
+      let(:person) do
+        Person.create
+      end
+
+      let(:criteria) do
+        Post.where(person_id: person.id)
+      end
+
+      let(:enumerable) do
+        described_class.new(criteria)
+      end
+
+      let!(:first_post) do
+        person.posts.create(title: "One")
+      end
+
+      let!(:second_post) do
+        person.posts.create(title: "Two")
+      end
+
+      it 'does not use the sort on id' do
+        expect(enumerable.first(id_sort: :none)).to eq(first_post)
+      end
+    end
+
+    context 'when the id_sort option is not provided' do
+
+      let(:person) do
+        Person.create
+      end
+
+      let(:criteria) do
+        Post.where(person_id: person.id)
+      end
+
+      let(:enumerable) do
+        described_class.new(criteria)
+      end
+
+      let!(:first_post) do
+        person.posts.create(title: "One")
+      end
+
+      let!(:second_post) do
+        person.posts.create(title: "Two")
+      end
+
+      it 'uses the sort on id' do
+        expect(enumerable.first).to eq(first_post)
+      end
+    end
   end
 
   describe "#include?" do
@@ -1344,6 +1398,60 @@ describe Mongoid::Relations::Targets::Enumerable do
         end
       end
     end
+
+    context 'when the id_sort option is none' do
+
+      let(:person) do
+        Person.create
+      end
+
+      let(:criteria) do
+        Post.where(person_id: person.id)
+      end
+
+      let(:enumerable) do
+        described_class.new(criteria)
+      end
+
+      let!(:first_post) do
+        person.posts.create(title: "One")
+      end
+
+      let!(:second_post) do
+        person.posts.create(title: "Two")
+      end
+
+      it 'does not use the sort on id' do
+        expect(enumerable.last(id_sort: :none)).to eq(first_post)
+      end
+    end
+
+    context 'when the id_sort option is not provided' do
+
+      let(:person) do
+        Person.create
+      end
+
+      let(:criteria) do
+        Post.where(person_id: person.id)
+      end
+
+      let(:enumerable) do
+        described_class.new(criteria)
+      end
+
+      let!(:first_post) do
+        person.posts.create(title: "One")
+      end
+
+      let!(:second_post) do
+        person.posts.create(title: "Two")
+      end
+
+      it 'uses the sort on id' do
+        expect(enumerable.last).to eq(second_post)
+      end
+    end
   end
 
   describe "#kind_of?" 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

data/spec/mongoid/reloadable_spec.rb

@@ -4,6 +4,25 @@ describe Mongoid::Reloadable do
 
   describe "#reload" do
 
+    context 'when persistence options are set' do
+
+      let(:person) do
+        Person.with(collection: 'other') do |person_class|
+          person_class.create
+        end
+      end
+
+      let(:reloaded) do
+        Person.with(collection: 'other') do |person_class|
+          person_class.first
+        end
+      end
+
+      it 'applies the persistence options' do
+        expect(person).to eq(reloaded)
+      end
+    end
+
     context "when using bson ids" do
 
       let(:person) do
@@ -106,6 +125,38 @@ describe Mongoid::Reloadable do
 
       context "when embedded a single level" do
 
+        context 'when persistence options are set' do
+
+          let(:person) do
+            Person.with(collection: 'other') do |person_class|
+              person_class.create
+            end
+          end
+
+          let!(:address) do
+            person.with(collection: 'other') do |person_object|
+              person_object.addresses.create(street: "Abbey Road", number: 4)
+            end
+          end
+
+          before do
+            Person.mongo_client[:other].find(
+                { "_id" => person.id }
+            ).update_one({ "$set" => { "addresses.0.number" => 3 }})
+          end
+
+          let!(:reloaded) do
+            person.with(collection: 'other') do |person_class|
+              person.addresses.first.reload
+            end
+          end
+
+          it "reloads the embedded document attributes" do
+            expect(reloaded.number).to eq(3)
+          end
+
+        end
+
         context "when the relation is an embeds many" do
 
           let!(:address) do

data/spec/mongoid/scopable_spec.rb

@@ -1130,6 +1130,19 @@ describe Mongoid::Scopable do
     it "sets the threading options" do
       Band.without_default_scope do
         expect(Mongoid::Threaded).to be_executing(:without_default_scope)
+        expect(Mongoid::Threaded.without_default_scope?(Band)).to be(true)
+      end
+    end
+
+    it "suppresses default scope on the given model within the given block" do
+      Appointment.without_default_scope do
+        expect(Appointment.all.selector).to be_empty
+      end
+    end
+
+    it "does not affect other models' default scopes within the given block" do
+      Appointment.without_default_scope do
+        expect(Audio.all.selector).not_to be_empty
       end
     end
   end

data/spec/mongoid/serializable_spec.rb

@@ -829,54 +829,4 @@ describe Mongoid::Serializable do
       end
     end
   end
-
-  describe "#to_xml" do
-
-    context "BSON::ObjectId" do
-
-      let(:person) do
-        Person.new
-      end
-
-      it "serializes as string" do
-        expect(person.to_xml).to include("<_id>#{person.id}</_id>")
-      end
-    end
-
-    context "when an Array field is defined" do
-
-      let(:person) do
-        Person.new(
-          aliases: [ "Kelly", "Machine Gun" ]
-        )
-      end
-
-      it "properly types the array" do
-        expect(person.to_xml).to include("<aliases type=\"array\">")
-      end
-
-      it "serializes the array" do
-        expect(person.to_xml).to include("<alias>Kelly</alias>")
-        expect(person.to_xml).to include("<alias>Machine Gun</alias>")
-      end
-    end
-
-    context "when a Hash field is defined" do
-
-      let(:person) do
-        Person.new(
-          map: { lat: 24.5, long: 22.1 }
-        )
-      end
-
-      it "properly types the hash" do
-        expect(person.to_xml).to include("<map>")
-      end
-
-      it "serializes the hash" do
-        expect(person.to_xml).to include("<lat type=\"float\">24.5</lat>")
-        expect(person.to_xml).to include("<long type=\"float\">22.1</long>")
-      end
-    end
-  end
 end

data/spec/mongoid/threaded_spec.rb

@@ -233,4 +233,72 @@ describe Mongoid::Threaded do
       end
     end
   end
+
+  describe "#begin_without_default_scope" do
+
+    let(:klass) do
+      Appointment
+    end
+
+    after do
+      described_class.exit_without_default_scope(klass)
+    end
+
+    it "adds the given class to the without_default_scope stack" do
+      described_class.begin_without_default_scope(klass)
+
+      expect(described_class.stack(:without_default_scope)).to include(klass)
+    end
+  end
+
+  describe "#exit_without_default_scope" do
+
+    let(:klass) do
+      Appointment
+    end
+
+    before do
+      described_class.begin_without_default_scope(klass)
+    end
+
+    it "removes the given class from the without_default_scope stack" do
+      described_class.exit_without_default_scope(klass)
+
+      expect(described_class.stack(:without_default_scope)).not_to include(klass)
+    end
+  end
+
+  describe "#without_default_scope?" do
+
+    let(:klass) do
+      Appointment
+    end
+
+    context "when klass has begun without_default_scope" do
+
+      before do
+        described_class.begin_without_default_scope(klass)
+      end
+
+      after do
+        described_class.exit_without_default_scope(klass)
+      end
+
+      it "returns true" do
+        expect(described_class.without_default_scope?(klass)).to be(true)
+      end
+    end
+
+    context "when klass has exited without_default_scope" do
+
+      before do
+        described_class.begin_without_default_scope(klass)
+        described_class.exit_without_default_scope(klass)
+      end
+
+      it "returns false" do
+        expect(described_class.without_default_scope?(klass)).to be(false)
+      end
+    end
+  end
 end