mongoid 7.5.4 → 8.1.6

data/spec/mongoid/persistable/upsertable_spec.rb

@@ -42,8 +42,10 @@ describe Mongoid::Persistable::Upsertable do
           end
         end
 
+        let(:options) { {} }
+
         before do
-          updated.upsert
+          updated.upsert(options)
         end
 
         it "updates the existing document" do
@@ -53,6 +55,47 @@ describe Mongoid::Persistable::Upsertable do
         it "flags the document as persisted" do
           expect(existing).to be_persisted
         end
+
+        shared_examples "replaces the existing fields" do
+          it 'replaces the existing fields' do
+            Band.count.should == 1
+
+            existing.reload
+            existing.views.should be nil
+            existing.name.should == 'Tool'
+          end
+        end
+
+        shared_examples "retains the existing fields" do
+          it 'retains the existing fields' do
+            Band.count.should == 1
+
+            existing.reload
+            existing.views.should eq(42)
+            existing.name.should == 'Tool'
+          end
+        end
+
+        context 'when existing document contains other fields' do
+          let!(:existing) do
+            Band.create!(name: "Photek", views: 42)
+          end
+
+          context "when not passing any options" do
+            let(:options) { {} }
+            it_behaves_like "replaces the existing fields"
+          end
+
+          context "when passing replace: false" do
+            let(:options) { { replace: false } }
+            it_behaves_like "retains the existing fields"
+          end
+
+          context "when passing replace: true" do
+            let(:options) { { replace: true } }
+            it_behaves_like "replaces the existing fields"
+          end
+        end
       end
 
       context "when no matching document exists in the db" do
@@ -104,5 +147,50 @@ describe Mongoid::Persistable::Upsertable do
         end
       end
     end
+
+    context "when the document is readonly" do
+
+      context "when legacy_readonly is true" do
+        config_override :legacy_readonly, true
+
+        let!(:existing) do
+          Band.create!(name: "Photek")
+        end
+
+        before do
+          existing.name = "Depeche Mode"
+        end
+
+        let!(:upsert) do
+          existing.upsert
+        end
+
+        it "updates the existing document" do
+          expect(existing.reload.name).to eq("Depeche Mode")
+        end
+
+        it "returns true" do
+          expect(upsert).to be true
+        end
+      end
+
+      context "when legacy_readonly is false" do
+        config_override :legacy_readonly, false
+
+        let!(:existing) do
+          Band.create!(name: "Photek").tap(&:readonly!)
+        end
+
+        before do
+          existing.name = "Depeche Mode"
+        end
+
+        it 'raises a ReadonlyDocument error' do
+          expect do
+            existing.upsert
+          end.to raise_error(Mongoid::Errors::ReadonlyDocument)
+        end
+      end
+    end
   end
 end

data/spec/mongoid/persistence_context_spec.rb

@@ -411,19 +411,12 @@ describe Mongoid::PersistenceContext do
         end
 
         context 'when there is a database override' do
+          persistence_context_override :database, :other
 
           before do
             object.store_in database: :musique
           end
 
-          before do
-            Mongoid::Threaded.database_override = :other
-          end
-
-          after do
-            Mongoid::Threaded.database_override = nil
-          end
-
           it 'uses the override' do
             expect(persistence_context.database_name).to eq(:other)
           end
@@ -458,14 +451,7 @@ describe Mongoid::PersistenceContext do
         end
 
         context 'when there is a database override' do
-
-          before do
-            Mongoid::Threaded.database_override = :other
-          end
-
-          after do
-            Mongoid::Threaded.database_override = nil
-          end
+          persistence_context_override :database, :other
 
           it 'uses the persistence context options' do
             expect(persistence_context.database_name).to eq(:musique)
@@ -517,14 +503,7 @@ describe Mongoid::PersistenceContext do
         end
 
         context 'when there is a database override' do
-
-          before do
-            Mongoid::Threaded.database_override = :other
-          end
-
-          after do
-            Mongoid::Threaded.database_override = nil
-          end
+          persistence_context_override :database, :other
 
           it 'uses the persistence context options' do
             expect(persistence_context.database_name).to eq(:musique)
@@ -535,14 +514,7 @@ describe Mongoid::PersistenceContext do
       context 'when there are no options passed to the Persistence Context' do
 
         context 'when there is a database override' do
-
-          before do
-            Mongoid::Threaded.database_override = :other
-          end
-
-          after do
-            Mongoid::Threaded.database_override = nil
-          end
+          persistence_context_override :database, :other
 
           it 'uses the database override options' do
             expect(persistence_context.database_name).to eq(Mongoid::Threaded.database_override)
@@ -585,15 +557,7 @@ describe Mongoid::PersistenceContext do
       end
 
       context 'when there is a client override' do
-
-        before do
-          Mongoid::Threaded.client_override = :other
-        end
-
-        after do
-          persistence_context.client.close
-          Mongoid::Threaded.client_override = nil
-        end
+        persistence_context_override :client, :other
 
         it 'uses the client option' do
           expect(persistence_context.client).to eq(Mongoid::Clients.with_name(:alternative))
@@ -637,14 +601,7 @@ describe Mongoid::PersistenceContext do
       end
 
       context 'when there is a client override' do
-
-        before do
-          Mongoid::Threaded.client_override = :alternative
-        end
-
-        after do
-          Mongoid::Threaded.client_override = nil
-        end
+        persistence_context_override :client, :alternative
 
         it 'uses the client override' do
           expect(persistence_context.client).to eq(Mongoid::Clients.with_name(:alternative))
@@ -680,14 +637,7 @@ describe Mongoid::PersistenceContext do
         end
 
         context 'when there is a client override' do
-
-          before do
-            Mongoid::Threaded.client_override = :alternative
-          end
-
-          after do
-            Mongoid::Threaded.client_override = nil
-          end
+          persistence_context_override :client, :alternative
 
           it 'uses the client override' do
             expect(persistence_context.client).to eq(Mongoid::Clients.with_name(:alternative))
@@ -718,4 +668,28 @@ describe Mongoid::PersistenceContext do
       end
     end
   end
+
+  context "when using an alternate database to update a document" do
+    let(:user) do
+      User.new(name: '1')
+    end
+
+    before do
+      user.with(database: database_id_alt) do |u|
+        u.save!
+      end
+
+      expect do
+        user.with(database: database_id_alt) do |u|
+          u.update(name:'2')
+        end
+      end.to_not raise_error
+    end
+
+    it "persists the update" do
+      User.with("database" => database_id_alt) do |klass|
+        expect(klass.find(user._id).name).to eq("2")
+      end
+    end
+  end
 end

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

@@ -24,81 +24,12 @@ describe Mongoid::QueryCache do
     Mrss::SessionRegistry.instance.verify_sessions_ended!
   end
 
-  let(:reset_legacy_qc_warning) do
-    begin
-      Mongoid::QueryCache.remove_instance_variable('@legacy_query_cache_warned')
-    rescue NameError
-      # raised if the instance variable wasn't set
-    end
-  end
-
   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 'with driver query cache' do
 
       context 'when query cache is not enabled' do
-        before do
-          Mongoid::QueryCache.enabled = false
-        end
+        override_query_cache false
 
         it 'turns on the query cache within the block' do
           expect(Mongoid::QueryCache.enabled?).to be false
@@ -112,9 +43,7 @@ describe Mongoid::QueryCache do
       end
 
       context 'when query cache is enabled' do
-        before do
-          Mongoid::QueryCache.enabled = true
-        end
+        override_query_cache true
 
         it 'keeps the query cache enabled within the block' do
           expect(Mongoid::QueryCache.enabled?).to be true
@@ -144,70 +73,11 @@ describe Mongoid::QueryCache do
   end
 
   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 'with driver query cache' do
 
       context 'when query cache is not enabled' do
-        before do
-          Mongoid::QueryCache.enabled = false
-        end
+        override_query_cache false
 
         it 'keeps the query cache turned off within the block' do
           expect(Mongoid::QueryCache.enabled?).to be false
@@ -221,9 +91,7 @@ describe Mongoid::QueryCache do
       end
 
       context 'when query cache is enabled' do
-        before do
-          Mongoid::QueryCache.enabled = true
-        end
+        override_query_cache true
 
         it 'turns off the query cache within the block' do
           expect(Mongoid::QueryCache.enabled?).to be true
@@ -277,10 +145,7 @@ describe Mongoid::QueryCache do
       end
 
       context 'does not query for the relation and instead sets the base' do
-
-        before do
-          Mongoid::QueryCache.enabled = false
-        end
+        override_query_cache false
 
         it 'queries for each access to the base' do
           expect(server).to receive(:with_connection).exactly(0).times.and_call_original
@@ -298,10 +163,7 @@ describe Mongoid::QueryCache do
       end
 
       context 'when query cache is disabled' do
-
-        before do
-          Mongoid::QueryCache.enabled = false
-        end
+        override_query_cache false
 
         it 'does not query for access to the base' do
           expect(server).to receive(:context).exactly(0).times.and_call_original
@@ -312,10 +174,7 @@ describe Mongoid::QueryCache do
       end
 
       context 'when query cache is enabled' do
-
-        before do
-          Mongoid::QueryCache.enabled = true
-        end
+        override_query_cache true
 
         it 'does not query for access to the base' do
           expect(server).to receive(:context).exactly(0).times.and_call_original
@@ -328,7 +187,6 @@ describe Mongoid::QueryCache do
   end
 
   context 'when driver query cache exists' do
-    min_driver_version '2.14'
 
     before do
       Band.all.to_a
@@ -362,10 +220,7 @@ describe Mongoid::QueryCache do
     end
 
     context 'when block is cached' do
-
-      before do
-        Mongoid::QueryCache.enabled = false
-      end
+      override_query_cache false
 
       it 'uses the driver query cache' do
         expect(Mongo::QueryCache).to receive(:cache).and_call_original
@@ -378,10 +233,7 @@ describe Mongoid::QueryCache do
     end
 
     context 'when block is uncached' do
-
-      before do
-        Mongoid::QueryCache.enabled = true
-      end
+      override_query_cache true
 
       it 'uses the driver query cache' do
         expect(Mongo::QueryCache).to receive(:uncached).and_call_original
@@ -424,14 +276,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|
@@ -441,10 +285,7 @@ describe Mongoid::QueryCache do
       end
 
       context "when query cache is disabled" do
-
-        before do
-          Mongoid::QueryCache.enabled = false
-        end
+        override_query_cache false
 
         it "queries again" do
           expect_query(1) do
@@ -567,10 +408,7 @@ describe Mongoid::QueryCache do
     end
 
     context "when query cache is disabled" do
-
-      before do
-        Mongoid::QueryCache.enabled = false
-      end
+      override_query_cache false
 
       it "queries again" do
         expect_query(1) do
@@ -662,12 +500,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 +512,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
@@ -812,13 +634,7 @@ describe Mongoid::QueryCache do
    end
 
     context "when query caching is enabled and the batch_size is set" do
-
-      around(:each) do |example|
-        query_cache_enabled = Mongoid::QueryCache.enabled?
-        Mongoid::QueryCache.enabled = true
-        example.run
-        Mongoid::QueryCache.enabled = query_cache_enabled
-      end
+      override_query_cache true
 
       it "does not raise an error when requesting the second batch" do
         expect {
@@ -827,7 +643,6 @@ describe Mongoid::QueryCache do
           end
         }.not_to raise_error
       end
-
     end
   end
 
@@ -895,10 +710,7 @@ describe Mongoid::QueryCache do
     end
 
     context 'when query cache is disabled' do
-
-      before do
-        Mongoid::QueryCache.enabled = false
-      end
+      override_query_cache false
 
       it "queries again" do
         band = Band.find(band_id)
@@ -962,15 +774,15 @@ describe Mongoid::QueryCache do
   end
 
   context 'when the initial query does not exhaust the results' do
+    override_query_cache true
+
     before do
-      Mongoid::QueryCache.enabled = true
       10.times { Band.create! }
 
       Band.batch_size(4).to_a
     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 +791,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
@@ -1021,4 +823,43 @@ describe Mongoid::QueryCache do
       school.students.to_a.length.should == 5
     end
   end
+
+  describe 'deprecation warnings' do
+
+    context '#cache' do
+      it 'should raise a warning' do
+        expect(Mongoid::Warnings).to receive(:warn_mongoid_query_cache)
+        Mongoid::QueryCache.cache {}
+      end
+    end
+
+    context '#uncached' do
+      it 'should raise a warning' do
+        expect(Mongoid::Warnings).to receive(:warn_mongoid_query_cache)
+        Mongoid::QueryCache.uncached {}
+      end
+    end
+
+    context '#clear_cache' do
+      it 'should raise a warning' do
+        expect(Mongoid::Warnings).to receive(:warn_mongoid_query_cache_clear)
+        Mongoid::QueryCache.clear_cache
+      end
+    end
+
+    context '#enabled?' do
+      it 'should raise a warning' do
+        expect(Mongoid::Warnings).to receive(:warn_mongoid_query_cache)
+        Mongoid::QueryCache.enabled?
+      end
+    end
+
+    context '#enabled=' do
+      it 'should raise a warning' do
+        old_enabled = Mongoid::QueryCache.enabled?
+        expect(Mongoid::Warnings).to receive(:warn_mongoid_query_cache)
+        Mongoid::QueryCache.enabled = old_enabled
+      end
+    end
+  end
 end