mongoid 7.1.1 → 8.1.0

data/spec/mongoid/persistable/updatable_spec.rb

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
+require "support/immutable_ids"
 
 describe Mongoid::Persistable::Updatable do
+  extend Mongoid::ImmutableIds
+  immutable_id_examples_as "persisted _ids are immutable"
 
   describe "#update_attribute" do
 
     context "when the field is aliased" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       context "when the setter is overridden" do
@@ -70,7 +72,7 @@ describe Mongoid::Persistable::Updatable do
     context "when setting an array field" do
 
       let(:person) do
-        Person.create(aliases: [])
+        Person.create!(aliases: [])
       end
 
       before do
@@ -118,7 +120,7 @@ describe Mongoid::Persistable::Updatable do
     context "when dynamic attributes are not enabled" do
 
       it "raises exception for an unknown attribute " do
-        account = Account.create
+        account = Account.create!(name: 'Foobar')
 
         expect {
           account.update_attribute(:somethingnew, "somethingnew")
@@ -126,7 +128,7 @@ describe Mongoid::Persistable::Updatable do
       end
 
       it "will update value of aliased field" do
-        person = Person.create
+        person = Person.create!
         person.update_attribute(:t, "test_value")
         expect(person.reload.t).to eq "test_value"
         expect(person.test).to eq "test_value"
@@ -232,21 +234,17 @@ describe Mongoid::Persistable::Updatable do
     end
 
     context "when persisting a localized field" do
+      with_default_i18n_configs
 
       let!(:product) do
-        Product.create(description: "The bomb")
+        Product.create!(description: "The bomb")
       end
 
       before do
-        I18n.enforce_available_locales = false
         ::I18n.locale = :de
         product.update_attribute(:description, "Die Bombe")
       end
 
-      after do
-        ::I18n.locale = :en
-      end
-
       let(:attributes) do
         product.attributes["description"]
       end
@@ -263,15 +261,15 @@ describe Mongoid::Persistable::Updatable do
     context "when updating a deeply embedded document" do
 
       let!(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:address) do
-        person.addresses.create(street: "Winterfeldtstr")
+        person.addresses.create!(street: "Winterfeldtstr")
       end
 
       let!(:location) do
-        address.locations.create(name: "work")
+        address.locations.create!(name: "work")
       end
 
       let(:from_db) do
@@ -302,7 +300,7 @@ describe Mongoid::Persistable::Updatable do
       end
 
       let(:person) do
-        Person.create(species: :human)
+        Person.create!(species: :human)
       end
 
       it 'raises an error when trying to set the attribute' do
@@ -347,7 +345,7 @@ describe Mongoid::Persistable::Updatable do
     context 'when the field is loaded explicitly' do
 
       before do
-        Person.create(title: 'Captain')
+        Person.create!(title: 'Captain')
       end
 
       context 'when the loaded attribute is updated' do
@@ -401,7 +399,7 @@ describe Mongoid::Persistable::Updatable do
     context 'when fields are explicitly not loaded' do
 
       before do
-        Person.create(title: 'Captain')
+        Person.create!(title: 'Captain')
       end
 
       context 'when the loaded attribute is updated' do
@@ -451,6 +449,14 @@ describe Mongoid::Persistable::Updatable do
         end
       end
     end
+
+    context 'when the field is _id' do
+      def invoke_operation!
+        object.update_attribute "_id", new_id_value
+      end
+
+      it_behaves_like "persisted _ids are immutable"
+    end
   end
 
   [:update_attributes, :update].each do |method|
@@ -458,45 +464,24 @@ describe Mongoid::Persistable::Updatable do
     describe "##{method}" do
 
       context "when saving with a hash field with invalid keys" do
+        max_server_version '4.9'
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         it "raises an error" do
           expect {
-            person.update_attributes(map: { "$bad.key" => "value" })
+            person.update_attributes!(map: { "$bad.key" => "value" })
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
 
-      context "when validation passes" do
-
-        let(:person) do
-          Person.create
-        end
-
-        let!(:saved) do
-          person.update_attributes(pets: false)
-        end
-
-        let(:from_db) do
-          Person.find(person.id)
-        end
-
-        it "returns true" do
-          expect(saved).to be true
-        end
-
-        it "saves the attributes" do
-          expect(from_db.pets).to be false
-        end
-      end
-
       context "when the document has been destroyed" do
+        max_server_version '4.9'
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         it "raises an error" do
@@ -509,7 +494,7 @@ describe Mongoid::Persistable::Updatable do
       context "when validation passes" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let!(:saved) do
@@ -532,7 +517,7 @@ describe Mongoid::Persistable::Updatable do
       context "when the document has been destroyed" do
 
         let!(:person) do
-          Person.create
+          Person.create!
         end
 
         before do
@@ -553,7 +538,7 @@ describe Mongoid::Persistable::Updatable do
         end
 
         let(:game) do
-          Game.create(person: person)
+          Game.create!(person: person)
         end
 
         before do
@@ -590,7 +575,7 @@ describe Mongoid::Persistable::Updatable do
         context "when providing an embedded child" do
 
           let!(:person) do
-            Person.create
+            Person.create!
           end
 
           let!(:name) do
@@ -617,11 +602,11 @@ describe Mongoid::Persistable::Updatable do
         context "when providing a parent to a referenced in" do
 
           let!(:person) do
-            Person.create
+            Person.create!
           end
 
           let!(:post) do
-            Post.create(title: "Testing")
+            Post.create!(title: "Testing")
           end
 
           context "when the relation has not yet been touched" do
@@ -682,7 +667,7 @@ describe Mongoid::Persistable::Updatable do
         before do
           phone_number.country_code = country_code
           person.phone_numbers << phone_number
-          person.save
+          person.save!
         end
 
         it "sets the first level document" do
@@ -720,6 +705,14 @@ describe Mongoid::Persistable::Updatable do
           end
         end
       end
+
+      context 'when the _id is one of the fields' do
+        def invoke_operation!
+          object.update_attributes _id: new_id_value
+        end
+  
+        it_behaves_like "persisted _ids are immutable"
+      end
     end
   end
 
@@ -738,4 +731,22 @@ describe Mongoid::Persistable::Updatable do
       end
     end
   end
+
+  describe "#update_attributes!" do
+
+    let(:person) do
+      Person.create!
+    end
+
+    let(:attributes) do
+      { security_code: 'secret' }
+    end
+
+    it 'calls update_attributes' do
+      person.should receive(:update_attributes).with(attributes).and_call_original
+      lambda do
+        person.update_attributes!(attributes)
+      end.should_not raise_error
+    end
+  end
 end

data/spec/mongoid/persistable/upsertable_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -32,7 +31,7 @@ describe Mongoid::Persistable::Upsertable do
     context "when the document is new" do
 
       let!(:existing) do
-        Band.create(name: "Photek")
+        Band.create!(name: "Photek")
       end
 
       context "when a matching document exists in the db" do
@@ -43,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
@@ -54,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
@@ -83,7 +125,7 @@ describe Mongoid::Persistable::Upsertable do
     context "when the document is not new" do
 
       let!(:existing) do
-        Band.create(name: "Photek")
+        Band.create!(name: "Photek")
       end
 
       context "when updating fields outside of the id" do
@@ -105,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/persistable_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -10,7 +9,7 @@ describe Mongoid::Persistable do
   describe "#atomically" do
 
     let(:document) do
-      Band.create(member_count: 0, likes: 60, origin: "London")
+      Band.create!(member_count: 0, likes: 60, origin: "London")
     end
 
     context "when providing a block" do
@@ -178,8 +177,8 @@ describe Mongoid::Persistable do
 
         before do
           class Band
-            def my_updates(*args)
-              atomically(*args) do |d|
+            def my_updates(**args)
+              atomically(**args) do |d|
                 d.set(name: "Placebo")
                 d.unset(:origin)
               end

data/spec/mongoid/persistence_context_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -40,7 +39,6 @@ describe Mongoid::PersistenceContext do
     end
   end
 
-
   describe '.get' do
 
     let(:options) do
@@ -135,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
@@ -387,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
@@ -434,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)
@@ -493,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)
@@ -511,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)
@@ -561,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))
@@ -613,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))
@@ -656,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))
@@ -694,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/positional_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/query_cache_middleware_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -20,7 +19,7 @@ describe Mongoid::QueryCache::Middleware do
       expect(code).to eq(200)
     end
 
-    it "enableds the query cache" do
+    it "enables the query cache" do
       middleware.call({})
       expect(@enabled).to be true
     end
@@ -40,9 +39,12 @@ describe Mongoid::QueryCache::Middleware do
       expect(code).to eq(200)
     end
 
-    it "cleans the query cache after reponds" do
-      middleware.call({})
-      expect(Mongoid::QueryCache.cache_table).to be_empty
+    context 'with driver query cache' do
+
+      it "cleans the query cache after it responds" do
+        middleware.call({})
+        expect(Mongo::QueryCache.send(:cache_table)).to be_empty
+      end
     end
   end
 end