mongoid 7.4.0 → 8.0.1

data/spec/mongoid/query_cache_middleware_spec.rb

@@ -40,29 +40,11 @@ describe Mongoid::QueryCache::Middleware do
     end
 
     context 'with driver query cache' do
-      min_driver_version '2.14'
 
       it "cleans the query cache after it responds" do
         middleware.call({})
         expect(Mongo::QueryCache.send(:cache_table)).to be_empty
       end
     end
-
-    context 'with mongoid query cache' do
-      max_driver_version '2.13'
-
-      it "cleans the query cache after it responds" do
-        middleware.call({})
-        expect(Mongoid::QueryCache.cache_table).to be_empty
-      end
-    end
-  end
-
-  context 'when driver implements query cache middleware' do
-    min_driver_version '2.15'
-
-    it 'uses the driver query cache middleware' do
-      Mongoid::QueryCache::Middleware.should be Mongo::QueryCache::Middleware
-    end
   end
 end

data/spec/mongoid/query_cache_spec.rb

@@ -34,66 +34,6 @@ describe Mongoid::QueryCache do
 
   describe '#cache' do
     context 'with driver query cache' do
-      min_driver_version '2.14'
-
-      it 'does not log a deprecation warning' do
-        reset_legacy_qc_warning
-
-        expect_any_instance_of(Logger).to_not receive(:warn).with(
-          described_class::LEGACY_WARNING
-        )
-        described_class.cache { }
-      end
-
-      context 'when query cache is not enabled' do
-        before do
-          Mongoid::QueryCache.enabled = false
-        end
-
-        it 'turns on the query cache within the block' do
-          expect(Mongoid::QueryCache.enabled?).to be false
-
-          Mongoid::QueryCache.cache do
-            expect(Mongoid::QueryCache.enabled?).to be true
-          end
-
-          expect(Mongoid::QueryCache.enabled?).to be false
-        end
-      end
-
-      context 'when query cache is enabled' do
-        before do
-          Mongoid::QueryCache.enabled = true
-        end
-
-        it 'keeps the query cache enabled within the block' do
-          expect(Mongoid::QueryCache.enabled?).to be true
-
-          Mongoid::QueryCache.cache do
-            expect(Mongoid::QueryCache.enabled?).to be true
-          end
-
-          expect(Mongoid::QueryCache.enabled?).to be true
-        end
-      end
-
-      context 'nested inside #uncached' do
-        it 'turns on the query cache in the block' do
-          Mongoid::QueryCache.uncached do
-            expect(Mongoid::QueryCache.enabled?).to be false
-
-            Mongoid::QueryCache.cache do
-              expect(Mongoid::QueryCache.enabled?).to be true
-            end
-
-            expect(Mongoid::QueryCache.enabled?).to be false
-          end
-        end
-      end
-    end
-
-    context 'with mongoid query cache' do
-      max_driver_version '2.13'
 
       context 'when query cache is not enabled' do
         before do
@@ -145,64 +85,6 @@ describe Mongoid::QueryCache do
 
   describe '#uncached' do
     context 'with driver query cache' do
-      min_driver_version '2.14'
-
-      context 'when query cache is not enabled' do
-        before do
-          Mongoid::QueryCache.enabled = false
-        end
-
-        it 'keeps the query cache turned off within the block' do
-          expect(Mongoid::QueryCache.enabled?).to be false
-
-          Mongoid::QueryCache.uncached do
-            expect(Mongoid::QueryCache.enabled?).to be false
-          end
-
-          expect(Mongoid::QueryCache.enabled?).to be false
-        end
-      end
-
-      context 'when query cache is enabled' do
-        before do
-          Mongoid::QueryCache.enabled = true
-        end
-
-        it 'turns off the query cache within the block' do
-          expect(Mongoid::QueryCache.enabled?).to be true
-
-          Mongoid::QueryCache.uncached do
-            expect(Mongoid::QueryCache.enabled?).to be false
-          end
-
-          expect(Mongoid::QueryCache.enabled?).to be true
-        end
-      end
-
-      context 'nested inside #cache' do
-        it 'turns on the query cache in the block' do
-          Mongoid::QueryCache.cache do
-            expect(Mongoid::QueryCache.enabled?).to be true
-
-            Mongoid::QueryCache.uncached do
-              expect(Mongoid::QueryCache.enabled?).to be false
-            end
-
-            expect(Mongoid::QueryCache.enabled?).to be true
-          end
-        end
-      end
-    end
-
-    context 'with mongoid query cache' do
-      max_driver_version '2.13'
-
-      it 'logs a deprecation warning' do
-        reset_legacy_qc_warning
-
-        expect_any_instance_of(Logger).to receive(:warn).with(described_class::LEGACY_WARNING)
-        described_class.cache { }
-      end
 
       context 'when query cache is not enabled' do
         before do
@@ -328,7 +210,6 @@ describe Mongoid::QueryCache do
   end
 
   context 'when driver query cache exists' do
-    min_driver_version '2.14'
 
     before do
       Band.all.to_a
@@ -424,14 +305,6 @@ describe Mongoid::QueryCache do
     end
   end
 
-  context 'when drivers query cache does not exist' do
-    max_driver_version '2.13'
-
-    it 'does not recognize the driver query cache' do
-      expect(defined?(Mongo::QueryCache)).to be_nil
-    end
-  end
-
   context "when querying for a single document" do
 
     [ :first, :one, :last ].each do |method|
@@ -662,12 +535,8 @@ describe Mongoid::QueryCache do
         end
 
         context "when the next query has a limit" do
-          # Server versions older than 3.2 also perform a killCursors operation,
-          # which causes this test to fail.
-          min_server_version '3.2'
 
           context 'with driver query cache' do
-            min_driver_version '2.14'
 
             # The driver query cache re-uses results with a larger limit
             it 'does not query again' do
@@ -678,18 +547,6 @@ describe Mongoid::QueryCache do
               end
             end
           end
-
-          context 'with mongoid query cache' do
-            max_driver_version '2.13'
-
-            it 'queries again' do
-              expect_query(1) do
-                result = game.ratings.where(:value.gt => 5).limit(2).asc(:id).to_a
-                expect(result.length).to eq(2)
-                expect(result.map { |r| r['value'] }).to eq([6, 7])
-              end
-            end
-          end
         end
 
         context "when the new query does not have a limit" do
@@ -970,7 +827,6 @@ describe Mongoid::QueryCache do
     end
 
     context 'with driver query cache' do
-      min_driver_version '2.14'
 
       # The driver query cache caches multi-batch cursors
       it 'does cache the result' do
@@ -979,16 +835,6 @@ describe Mongoid::QueryCache do
         end
       end
     end
-
-    context 'with mongoid query cache' do
-      max_driver_version '2.13'
-
-      it 'does not cache the result' do
-        expect_query(1) do
-          expect(Band.all.map(&:id).size).to eq(10)
-        end
-      end
-    end
   end
 
   context 'when storing in system collection' do

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
 
@@ -628,5 +628,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

@@ -783,9 +783,11 @@ describe Mongoid::Scopable do
             "$or" => [
               { "ccc" => nil },
               { "ccc" => { "$gt" => 1.0 }},
+            ],
+            '$and' => ['$or' => [
               { "aaa" => { "$gt" => 0.0 }},
               { "bbb" => { "$gt" => 0.0 }}
-            ]
+            ]],
           })
         end
       end
@@ -1170,6 +1172,24 @@ describe Mongoid::Scopable do
         end
       end
     end
+
+    context 'when nesting unsoped 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/shardable_spec.rb

@@ -186,5 +186,19 @@ describe Mongoid::Shardable do
         it { is_expected.to eq({ 'name' => value }) }
       end
     end
+
+    context "when record is not found" do
+      let!(:instance) { klass.create!(name: value) }
+
+      before do
+        instance.destroy
+      end
+
+      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, /Document not found for class Band with id #{instance.id.to_s} and shard key name: a-brand-name./)
+      end
+    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