mongoid 7.5.4 → 8.1.9

data/spec/mongoid/reloadable_spec.rb

@@ -103,7 +103,7 @@ describe Mongoid::Reloadable do
       end
 
       it "resets attributes_before_type_cast" do
-        expect(person.attributes_before_type_cast).to be_empty
+        expect(person.attributes_before_type_cast).to eq(person.attributes)
       end
     end
 
@@ -114,7 +114,7 @@ describe Mongoid::Reloadable do
         it "raises an error" do
           expect {
             Person.new.reload
-          }.to raise_error(Mongoid::Errors::DocumentNotFound)
+          }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Person with id\(s\)/)
         end
       end
 
@@ -390,6 +390,30 @@ describe Mongoid::Reloadable do
       end
     end
 
+    context 'when embeds_many is modified' do
+      let(:contractor1) { Contractor.new(name: 'b') }
+      let(:contractor2) { Contractor.new(name: 'c') }
+
+      let(:building) do
+        Building.create!(name: 'a', contractors: [ contractor1 ])
+      end
+
+      let(:more_contractors) { building.contractors + [ contractor2 ] }
+
+      let(:modified_building) do
+        building.tap do
+          building.assign_attributes contractors: more_contractors
+        end
+      end
+
+      let(:reloaded_building) { modified_building.reload }
+
+      it 'resets delayed_atomic_sets' do
+        expect(modified_building.delayed_atomic_sets).not_to be_empty
+        expect(reloaded_building.delayed_atomic_sets).to be_empty
+      end
+    end
+
     context "when embedded document is nil" do
 
       let(:palette) do
@@ -488,12 +512,32 @@ describe Mongoid::Reloadable do
         Person.create!
       end
 
-      let(:reloaded) do
-        Person.only(:name).first.reload
+      context "when legacy_readonly is on" do
+        config_override :legacy_readonly, true
+
+        let(:reloaded) do
+          Person.only(:name).first.reload
+        end
+
+        it 'resets the readonly state after reloading' do
+          expect(reloaded.readonly?).to be(false)
+        end
       end
 
-      it 'resets the readonly state after reloading' do
-        expect(reloaded.readonly?).to be(false)
+      context "when legacy_readonly is off" do
+        config_override :legacy_readonly, false
+
+        let(:reloaded) do
+          Person.only(:name).first.tap do |doc|
+            doc.readonly!
+            expect(doc.readonly?).to be true
+            doc.reload
+          end
+        end
+
+        it 'does not reset the readonly state after reloading' do
+          expect(reloaded.readonly?).to be(true)
+        end
       end
     end
 
@@ -628,5 +672,38 @@ describe Mongoid::Reloadable do
         church.acolytes.first.name.should == 'Borg'
       end
     end
+
+    context 'when document has previous changes' do
+      context 'when document was updated' do
+        let(:person) do
+          Person.create!(title: 'Sir')
+        end
+
+        before do
+          person.title = 'Madam'
+          person.save!
+          person.reload
+        end
+
+        it "resets previous changes" do
+          expect(person.title_previously_was).to be_nil
+          expect(person).not_to be_previously_persisted
+        end
+      end
+
+      context 'when document was created' do
+        let(:person) do
+          Person.create!(title: 'Sir')
+        end
+
+        before do
+          person.reload
+        end
+
+        it "resets previous changes" do
+          expect(person).not_to be_previously_new_record
+        end
+      end
+    end
   end
 end

data/spec/mongoid/scopable_spec.rb

@@ -121,6 +121,76 @@ describe Mongoid::Scopable do
         expect(selector).to eq({'active' => true})
       end
     end
+
+    context "when the default scope is dotted" do
+
+      let(:criteria) do
+        Band.where('tags.foo' => 'bar')
+      end
+
+      before do
+        Band.default_scope ->{ criteria }
+      end
+
+      after do
+        Band.default_scoping = nil
+      end
+
+      let!(:band) do
+        Band.create!
+      end
+
+      it "adds the scope as a dotted key attribute" do
+        expect(band.attributes['tags.foo']).to eq('bar')
+      end
+
+      it "adds the default scope to the class" do
+        expect(Band.default_scoping.call).to eq(criteria)
+      end
+
+      it "flags as being default scoped" do
+        expect(Band).to be_default_scoping
+      end
+
+      it "does not find the correct document" do
+        expect(Band.count).to eq(0)
+      end
+    end
+
+    context "when the default scope is dotted with a query" do
+
+      let(:criteria) do
+        Band.where('tags.foo' => {'$eq' => 'bar'})
+      end
+
+      before do
+        Band.default_scope ->{ criteria }
+      end
+
+      after do
+        Band.default_scoping = nil
+      end
+
+      let!(:band) do
+        Band.create!('tags' => { 'foo' => 'bar' })
+      end
+
+      it "does not add the scope as a dotted key attribute" do
+        expect(band.attributes).to_not have_key('tags.foo')
+      end
+
+      it "adds the default scope to the class" do
+        expect(Band.default_scoping.call).to eq(criteria)
+      end
+
+      it "flags as being default scoped" do
+        expect(Band).to be_default_scoping
+      end
+
+      it "finds the correct document" do
+        expect(Band.where.first).to eq(band)
+      end
+    end
   end
 
   describe ".default_scopable?" do
@@ -801,9 +871,11 @@ describe Mongoid::Scopable do
             "$or" => [
               { "ccc" => nil },
               { "ccc" => { "$gt" => 1.0 }},
+            ],
+            '$and' => ['$or' => [
               { "aaa" => { "$gt" => 0.0 }},
               { "bbb" => { "$gt" => 0.0 }}
-            ]
+            ]],
           })
         end
       end
@@ -1188,6 +1260,24 @@ describe Mongoid::Scopable do
         end
       end
     end
+
+    context 'when nesting unscoped under with_scope' do
+      let(:c1) { Band.where(active: true) }
+
+      it 'restores previous scope' do
+        pending 'MONGOID-5214'
+
+        Band.with_scope(c1) do |crit|
+          Band.unscoped do |crit2|
+            Mongoid::Threaded.current_scope(Band).should be nil
+          end
+
+          Mongoid::Threaded.current_scope(Band).selector.should == {
+            'active' => true,
+          }
+        end
+      end
+    end
   end
 
   describe ".without_default_scope" do

data/spec/mongoid/serializable_spec.rb

@@ -14,19 +14,19 @@ describe Mongoid::Serializable do
       expect(guitar.send(:field_names, {})).to eq(guitar.fields.except("_type").keys.sort)
     end
 
-    context "when using a custom discriminator_key" do 
-      before do 
+    context "when using a custom discriminator_key" do
+      before do
         Instrument.discriminator_key = "dkey"
       end
 
-      after do 
+      after do
         Instrument.discriminator_key = nil
       end
 
       let(:guitar) do
         Guitar.new
       end
-  
+
       it "includes _type but does not include the new discriminator key" do
         expect(guitar.send(:field_names, {})).to eq(guitar.fields.except("dkey").keys.sort)
       end
@@ -41,15 +41,11 @@ describe Mongoid::Serializable do
       end
 
       after do
-        Mongoid.include_root_in_json = false
         reload_model(:Minim)
       end
 
       context "when global config is set to true" do
-
-        before do
-          Mongoid.include_root_in_json = true
-        end
+        config_override :include_root_in_json, true
 
         it "returns true" do
           expect(Minim.public_send(meth)).to be true
@@ -67,10 +63,7 @@ describe Mongoid::Serializable do
       end
 
       context "when global config set to false" do
-
-        before do
-          Mongoid.include_root_in_json = false
-        end
+        config_override :include_root_in_json, false
 
         it "returns false" do
           expect(Minim.public_send(meth)).to be false
@@ -89,13 +82,13 @@ describe Mongoid::Serializable do
     end
 
     describe "#include_root_in_json" do
+      config_override :include_root_in_json, false
 
       before do
         reload_model(:Minim)
       end
 
       after do
-        Mongoid.include_root_in_json = false
         reload_model(:Minim)
       end
 
@@ -127,10 +120,6 @@ describe Mongoid::Serializable do
 
       context "when global config set to false" do
 
-        before do
-          Mongoid.include_root_in_json = false
-        end
-
         it "returns false" do
           expect(minim.public_send(meth)).to be false
         end
@@ -297,14 +286,7 @@ describe Mongoid::Serializable do
       end
 
       context "when include_type_for_serialization is true" do
-
-        before do
-          Mongoid.include_type_for_serialization = true
-        end
-
-        after do
-          Mongoid.include_type_for_serialization = false
-        end
+        config_override :include_type_for_serialization, true
 
         it "includes _type field" do
           expect(person.serializable_hash.keys).to include '_type'
@@ -528,13 +510,15 @@ describe Mongoid::Serializable do
             end
 
             it "includes the first relation" do
-              expect(relation_hash[0]).to include
+              expect(relation_hash[0]).to include(
                 { "_id" => "kudamm", "street" => "Kudamm" }
+              )
             end
 
             it "includes the second relation" do
-              expect(relation_hash[1]).to include
+              expect(relation_hash[1]).to include(
                 { "_id" => "tauentzienstr", "street" => "Tauentzienstr" }
+              )
             end
           end
 
@@ -545,13 +529,15 @@ describe Mongoid::Serializable do
             end
 
             it "includes the first relation" do
-              expect(relation_hash[0]).to include
+              expect(relation_hash[0]).to include(
                 { "_id" => "kudamm", "street" => "Kudamm" }
+              )
             end
 
             it "includes the second relation" do
-              expect(relation_hash[1]).to include
+              expect(relation_hash[1]).to include(
                 { "_id" => "tauentzienstr", "street" => "Tauentzienstr" }
+              )
             end
           end
 
@@ -670,8 +656,9 @@ describe Mongoid::Serializable do
             end
 
             it "includes the specified relation" do
-              expect(relation_hash).to include
-                { "_id" => "leo-marvin", "first_name" => "Leo", "last_name" => "Marvin" }
+              expect(relation_hash).to include(
+                { "_id" => "Leo-Marvin", "first_name" => "Leo", "last_name" => "Marvin" }
+              )
             end
           end
 
@@ -682,8 +669,9 @@ describe Mongoid::Serializable do
             end
 
             it "includes the specified relation" do
-              expect(relation_hash).to include
-                { "_id" => "leo-marvin", "first_name" => "Leo", "last_name" => "Marvin" }
+              expect(relation_hash).to include(
+                { "_id" => "Leo-Marvin", "first_name" => "Leo", "last_name" => "Marvin" }
+              )
             end
           end
 
@@ -694,8 +682,9 @@ describe Mongoid::Serializable do
             end
 
             it "includes the specified relation sans exceptions" do
-              expect(relation_hash).to include
+              expect(relation_hash).to include(
                 { "first_name" => "Leo", "last_name" => "Marvin" }
+              )
             end
           end
         end
@@ -881,16 +870,13 @@ describe Mongoid::Serializable do
     end
 
     context "when including root in json via Mongoid" do
+      config_override :include_root_in_json, false
 
       before do
         account.include_root_in_json.should be false
         Mongoid.include_root_in_json = true
       end
 
-      after do
-        Mongoid.include_root_in_json = false
-      end
-
       it "uses the mongoid configuration" do
         expect(JSON.parse(account.to_json)).to have_key("account")
       end

data/spec/mongoid/shardable_spec.rb

@@ -233,10 +233,10 @@ describe Mongoid::Shardable do
           instance.destroy
         end
 
-        it "raises a DocumentNotFound error" do
+        it "raises a DocumentNotFound error with the shard key in the description on reload" do
           expect do
             instance.reload
-          end.to raise_error(Mongoid::Errors::DocumentNotFound)
+          end.to raise_error(Mongoid::Errors::DocumentNotFound, /Document not found for class Band with id #{instance.id.to_s} and shard key name: a-brand-name./)
         end
       end
     end
@@ -284,10 +284,10 @@ describe Mongoid::Shardable do
             instance.destroy
           end
   
-          it "raises a DocumentNotFound error" do
+          it "raises a DocumentNotFound error with the shard key in the description on reload" do
             expect do
               instance.reload
-            end.to raise_error(Mongoid::Errors::DocumentNotFound)
+            end.to raise_error(Mongoid::Errors::DocumentNotFound, /Document not found for class SmReview with id #{instance.id.to_s} and shard key author.name: Arthur Conan Doyle./)
           end
         end
       end

data/spec/mongoid/stateful_spec.rb

@@ -40,6 +40,25 @@ describe Mongoid::Stateful do
     end
   end
 
+  describe '#previously_new_record?' do
+    it "returns correct values" do
+      person = Person.new
+      expect(person).not_to be_a_previously_new_record
+      person.save!
+      expect(person).to be_a_previously_new_record
+      person.title = "Title"
+      person.save!
+      expect(person).not_to be_a_previously_new_record
+    end
+
+    it "resets after reload" do
+      person = Person.create!
+      expect(person).to be_a_previously_new_record
+      person.reload
+      expect(person).not_to be_a_previously_new_record
+    end
+  end
+
   describe "#persisted?" do
 
     let(:person) do
@@ -62,6 +81,15 @@ describe Mongoid::Stateful do
     end
   end
 
+  describe "#previously_persisted?" do
+    it "returns true after being destroyed" do
+      person = Person.create!
+      expect(person).not_to be_previously_persisted
+      person.destroy
+      expect(person).to be_previously_persisted
+    end
+  end
+
   describe "destroyed?" do
 
     let(:person) do
@@ -108,21 +136,135 @@ describe Mongoid::Stateful do
       Band.new
     end
 
-    context "when the document is readonly" do
+    context "when legacy_readonly is true" do
+      config_override :legacy_readonly, true
 
-      before do
-        document.__selected_fields = { test: 1 }
+      context "when the selected fields are set" do
+
+        before do
+          document.__selected_fields = { test: 1 }
+        end
+
+        it "returns true" do
+          expect(document).to be_readonly
+        end
       end
 
-      it "returns true" do
-        expect(document).to be_readonly
+      context "when no readonly has been set" do
+
+        it "returns false" do
+          expect(document).to_not be_readonly
+        end
+      end
+
+      context "when the readonly! method is called" do
+
+        let(:op) do
+          document.readonly!
+        end
+
+        it "returns false" do
+          op
+          expect(document).to_not be_readonly
+        end
+
+        it "warns" do
+          expect(Mongoid::Warnings).to receive(:warn_legacy_readonly)
+          op
+        end
+      end
+
+      context "when overriding readonly?" do
+
+        let(:doc) { ReadonlyModel.create! }
+
+        before do
+          class ReadonlyModel
+            include Mongoid::Document
+
+            attr_accessor :locked
+
+            def readonly?
+              !!locked
+            end
+          end
+        end
+
+        after do
+          Object.send(:remove_const, :ReadonlyModel)
+        end
+
+        it "raises when readonly? is true" do
+          expect(doc.readonly?).to be false
+          doc.locked = true
+          expect(doc.readonly?).to be true
+          expect do
+            doc.destroy
+          end.to raise_error(Mongoid::Errors::ReadonlyDocument)
+        end
       end
     end
 
-    context "when no readonly has been set" do
+    context "when legacy_readonly is false" do
+      config_override :legacy_readonly, false
 
-      it "returns false" do
-        expect(document).to_not be_readonly
+      context "when the selected fields are set" do
+
+        before do
+          document.__selected_fields = { test: 1 }
+        end
+
+        it "returns false" do
+          expect(document).to_not be_readonly
+        end
+      end
+
+      context "when the readonly! method is called" do
+
+        before do
+          document.readonly!
+        end
+
+        it "returns true" do
+          expect(document).to be_readonly
+        end
+      end
+
+      context "when no readonly has been set" do
+
+        it "returns false" do
+          expect(document).to_not be_readonly
+        end
+      end
+
+      context "when overriding readonly?" do
+
+        let(:doc) { ReadonlyModel.new }
+
+        before do
+          class ReadonlyModel
+            include Mongoid::Document
+
+            attr_accessor :locked
+
+            def readonly?
+              !!locked
+            end
+          end
+        end
+
+        after do
+          Object.send(:remove_const, :ReadonlyModel)
+        end
+
+        it "raises when readonly? is true" do
+          expect(doc.readonly?).to be false
+          doc.locked = true
+          expect(doc.readonly?).to be true
+          expect do
+            doc.save!
+          end.to raise_error(Mongoid::Errors::ReadonlyDocument)
+        end
       end
     end
   end