mongoid 7.5.1 → 8.1.2

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

@@ -39,7 +39,6 @@ describe Mongoid::PersistenceContext do
     end
   end
 
-
   describe '.get' do
 
     let(:options) do
@@ -134,6 +133,32 @@ describe Mongoid::PersistenceContext do
         end
       end
     end
+
+    context 'with reusable client' do
+      let(:options) do
+        {client: :some_client}
+      end
+
+      let(:cluster) do
+        double(Mongo::Cluster)
+      end
+
+      let(:client) do
+        double(Mongo::Client).tap do |client|
+          allow(client).to receive(:cluster).and_return(cluster)
+        end
+      end
+
+      before do
+        expect(Mongoid::Clients).to receive(:with_name).with(:some_client).and_return(client)
+        expect(client).not_to receive(:close)
+      end
+
+      it 'does not close the client' do
+        described_class.set(object, options)
+        described_class.clear(object, cluster.dup)
+      end
+    end
   end
 
   describe '#initialize' do
@@ -386,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
@@ -433,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)
@@ -492,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)
@@ -510,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)
@@ -560,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))
@@ -612,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))
@@ -655,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))
@@ -693,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