mongoid 7.4.3 → 8.0.7

data/spec/mongoid/changeable_spec.rb

@@ -555,6 +555,56 @@ describe Mongoid::Changeable do
     end
   end
 
+  describe '#attribute_previously_was' do
+    let(:previous_title) do
+      "Grand Poobah"
+    end
+
+    let(:age) do
+      10
+    end
+
+    let(:person) do
+      Person.create!(title: previous_title, age: age)
+    end
+
+    let(:updated_title) do
+      "Captain Obvious"
+    end
+
+    before do
+      person.title = updated_title
+      person.save!
+    end
+
+    context 'when attribute changed' do
+      it "returns the old value" do
+        expect(person.send(:attribute_previously_was, "title")).to eq(previous_title)
+      end
+
+      it "allows access via (attribute)_was" do
+        expect(person.title_previously_was).to eq(previous_title)
+      end
+    end
+
+    context 'when attribute did not change' do
+      it "returns the same value" do
+        expect(person.send(:attribute_previously_was, "age")).to eq(age)
+      end
+
+      it "allows access via (attribute)_was" do
+        expect(person.age_previously_was).to eq(age)
+      end
+    end
+
+    it 'clears after reload' do
+      person.reload
+      expect(person.title_previously_was).to be_nil
+      expect(person.age_previously_was).to be_nil
+    end
+
+  end
+
   describe "#attribute_will_change!" do
 
     let(:aliases) do
@@ -962,12 +1012,69 @@ describe Mongoid::Changeable do
         person.user_accounts << user_account
       end
 
-      it 'returns a hash of changes' do
-        pending 'https://jira.mongodb.org/browse/MONGOID-4843'
+      it 'should not add to the changes or changed_attributes hash' do
+        person.changes.should == {}
+        person.changed_attributes.should == {}
+      end
+    end
+
+    context 'when habtm association _ids changes' do
 
-        person.changes.should == {
-          user_account_ids: [[], [user_account.id]]
-        }
+      let(:person) do
+        Person.create!(title: "Grand Poobah")
+      end
+
+      let(:user_account) do
+        UserAccount.create!
+      end
+
+      before do
+        person.user_account_ids << user_account._id
+      end
+
+      it 'should add to the changes or changed_attributes hash' do
+        person.changes.should == { "user_account_ids" => [ nil, [ user_account._id ] ] }
+        person.changed_attributes.should == { "user_account_ids" => nil }
+      end
+    end
+
+    context 'when assigning empty list to habtm association' do
+
+      let(:person) do
+        Person.create!(title: "Grand Poobah", user_accounts: [user_account])
+      end
+
+      let(:user_account) do
+        UserAccount.create!
+      end
+
+      before do
+        person.user_accounts = []
+      end
+
+      it 'should not add to the changes or changed_attributes hash' do
+        person.changes.should == {}
+        person.changed_attributes.should == {}
+      end
+    end
+
+    context 'when assigning empty list to habtm association _ids' do
+
+      let(:person) do
+        Person.create!(title: "Grand Poobah", user_accounts: [user_account])
+      end
+
+      let(:user_account) do
+        UserAccount.create!
+      end
+
+      before do
+        person.user_account_ids = []
+      end
+
+      it 'should not add to the changes or changed_attributes hash' do
+        person.changes.should == { "user_account_ids" => [ [ user_account._id ], [] ] }
+        person.changed_attributes.should ==  { "user_account_ids" => [ user_account._id ] }
       end
     end
 
@@ -1649,21 +1756,26 @@ describe Mongoid::Changeable do
 
       before do
         Acolyte.set_callback(:save, :after, if: :callback_test?) do |doc|
-          doc[:changed_in_callback] = doc.changes.dup
+          doc[:changed_in_after_callback] = doc.changes.dup
+        end
+
+        Acolyte.set_callback(:save, :before, if: :callback_test?) do |doc|
+          doc[:changed_in_before_callback] = doc.changes.dup
         end
       end
 
       after do
         Acolyte._save_callbacks.select do |callback|
-          callback.kind == :after
+          [:before, :after].include?(callback.kind)
         end.each do |callback|
           Acolyte._save_callbacks.delete(callback)
         end
       end
 
-      it "retains the changes until after all callbacks" do
+      it "does not retain the changes until after all callbacks" do
         acolyte.update_attribute(:status, "testing")
-        expect(acolyte.changed_in_callback).to eq({ "status" => [ nil, "testing" ] })
+        expect(acolyte.changed_in_before_callback).to eq({"status"=>[nil, "testing"]})
+        expect(acolyte.changed_in_after_callback).to eq({  })
       end
     end
 
@@ -1675,21 +1787,26 @@ describe Mongoid::Changeable do
 
       before do
         Acolyte.set_callback(:save, :after, if: :callback_test?) do |doc|
-          doc[:changed_in_callback] = doc.changes.dup
+          doc[:changed_after_in_callback] = doc.changes.dup
+        end
+
+        Acolyte.set_callback(:save, :before, if: :callback_test?) do |doc|
+          doc[:changed_before_in_callback] = doc.changes.dup
         end
       end
 
       after do
         Acolyte._save_callbacks.select do |callback|
-          callback.kind == :after
+          [:before, :after].include?(callback.kind)
         end.each do |callback|
           Acolyte._save_callbacks.delete(callback)
         end
       end
 
-      it "retains the changes until after all callbacks" do
+      it "does not retain the changes until after all callbacks" do
         acolyte.save!
-        expect(acolyte.changed_in_callback["name"]).to eq([ nil, "callback-test" ])
+        expect(acolyte.changed_before_in_callback["name"]).to eq([ nil, "callback-test" ])
+        expect(acolyte.changed_after_in_callback["name"]).to be_nil
       end
     end
   end

data/spec/mongoid/clients/factory_spec.rb

@@ -65,10 +65,7 @@ describe Mongoid::Clients::Factory do
             expect(client).to be_a(Mongo::Client)
           end
 
-          context 'not JRuby' do
-            # Run this test on JRuby when driver 2.16.0 is released -
-            # see RUBY-2771.
-            fails_on_jruby
+          context 'on driver versions that do not report spurious EOF errors' do
 
             it 'does not produce driver warnings' do
               Mongo::Logger.logger.should_not receive(:warn)
@@ -86,35 +83,31 @@ describe Mongoid::Clients::Factory do
             expect(client.options[:platform]).to eq(Mongoid::PLATFORM_DETAILS)
           end
 
-          context 'driver 2.13+' do
-            min_driver_version '2.13'
+          it 'sets Mongoid as a wrapping library' do
+            client.options[:wrapping_libraries].should == [BSON::Document.new(
+              Mongoid::Clients::Factory::MONGOID_WRAPPING_LIBRARY)]
+          end
 
-            it 'sets Mongoid as a wrapping library' do
-              client.options[:wrapping_libraries].should == [BSON::Document.new(
-                Mongoid::Clients::Factory::MONGOID_WRAPPING_LIBRARY)]
-            end
+          context 'when configuration specifies a wrapping library' do
 
-            context 'when configuration specifies a wrapping library' do
-
-              let(:config) do
-                {
-                  default: { hosts: SpecConfig.instance.addresses, database: database_id },
-                  analytics: {
-                    hosts: SpecConfig.instance.addresses,
-                    database: database_id,
-                    options: {
-                      wrapping_libraries: [{name: 'Foo'}],
-                    },
-                  }
+            let(:config) do
+              {
+                default: { hosts: SpecConfig.instance.addresses, database: database_id },
+                analytics: {
+                  hosts: SpecConfig.instance.addresses,
+                  database: database_id,
+                  options: {
+                    wrapping_libraries: [{name: 'Foo'}],
+                  },
                 }
-              end
-
-              it 'adds Mongoid as another wrapping library' do
-                client.options[:wrapping_libraries].should == [
-                  BSON::Document.new(Mongoid::Clients::Factory::MONGOID_WRAPPING_LIBRARY),
-                  {'name' => 'Foo'},
-                ]
-              end
+              }
+            end
+
+            it 'adds Mongoid as another wrapping library' do
+              client.options[:wrapping_libraries].should == [
+                BSON::Document.new(Mongoid::Clients::Factory::MONGOID_WRAPPING_LIBRARY),
+                {'name' => 'Foo'},
+              ]
             end
           end
         end

data/spec/mongoid/clients/options_spec.rb

@@ -413,6 +413,7 @@ describe Mongoid::Clients::Options, retry: 3 do
         end
 
         context 'when the options create a new cluster' do
+          retry_test
           # This test fails on sharded topologies in Evergreen but not locally
           require_topology :single, :replica_set
 

data/spec/mongoid/clients/sessions_spec.rb

@@ -166,25 +166,6 @@ describe Mongoid::Clients::Sessions do
         end
       end
     end
-
-    context 'when sessions are not supported' do
-      max_server_version '3.4'
-
-      let!(:error) do
-        e = nil
-        begin
-          Person.with_session {}
-        rescue => ex
-          e = ex
-        end
-        e
-      end
-
-      it 'raises a sessions not supported error' do
-        expect(error).to be_a(Mongoid::Errors::InvalidSessionUse)
-        expect(error.message).to include('not supported')
-      end
-    end
   end
 
   context 'when a session is used on a model instance' do
@@ -312,24 +293,5 @@ describe Mongoid::Clients::Sessions do
         end
       end
     end
-
-    context 'when sessions are not supported' do
-      max_server_version '3.4'
-
-      let!(:error) do
-        e = nil
-        begin
-          person.with_session {}
-        rescue => ex
-          e = ex
-        end
-        e
-      end
-
-      it 'raises a sessions not supported error' do
-        expect(error).to be_a(Mongoid::Errors::InvalidSessionUse)
-        expect(error.message).to include('not supported')
-      end
-    end
   end
 end

data/spec/mongoid/clients_spec.rb

@@ -802,7 +802,7 @@ describe Mongoid::Clients do
         it "does not persist to the default database" do
           expect {
             Band.find(band.id)
-          }.to raise_error(Mongoid::Errors::DocumentNotFound)
+          }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
         end
 
         let(:from_db) do
@@ -840,7 +840,7 @@ describe Mongoid::Clients do
         it "does not persist to the default database" do
           expect {
             Band.find(band.id)
-          }.to raise_error(Mongoid::Errors::DocumentNotFound)
+          }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Band with id\(s\)/)
         end
 
         let(:from_db) do
@@ -1012,6 +1012,61 @@ describe Mongoid::Clients do
         end
       end
     end
+
+    context 'when requesting named client' do
+      let(:secondary_client) do
+        double(Mongo::Client).tap do |client|
+          allow(client).to receive(:cluster).and_return(double("cluster"))
+        end
+      end
+
+      before do
+        expect(Mongoid::Clients::Factory).to receive(:create)
+          .with(:secondary)
+          .and_return(secondary_client)
+      end
+
+      after do
+        Mongoid::Clients.clients.delete(:secondary)
+      end
+
+      it 'does not close the client' do
+        expect(secondary_client).not_to receive(:close)
+
+        Band.with(client: :default) do |klass|
+          klass.mongo_client
+        end
+
+        Band.with(client: :secondary) do |klass|
+          klass.mongo_client
+        end
+      end
+    end
+
+    context 'when using on different objects' do
+      require_mri
+
+      let(:first_band) do
+        Band.create!(name: "The Beatles")
+      end
+
+      let(:second_band) do
+        Band.create!(name: 'Led Zeppelin')
+      end
+
+      it 'does not create extra symbols symbols' do
+        first_band.with(write: { w: 0, j: false }) do |band|
+          band.set(active: false)
+        end
+        initial_symbols_count = Symbol.all_symbols.size
+        second_band.with(write: { w: 0, j: false }) do |band|
+          band.set(active: false)
+        end
+        expect(Symbol.all_symbols.size).to eq(initial_symbols_count)
+      end
+
+    end
+
   end
 
   context "when overriding the default database" do

data/spec/mongoid/config_spec.rb

@@ -204,7 +204,7 @@ describe Mongoid::Config do
 
         Mongoid.configure { |config| config.load_configuration(configuration) }
 
-        expect(Mongoid::Config.discriminator_key).to be("_type")
+        expect(Mongoid::Config.discriminator_key).to eq("_type")
       end
     end
 
@@ -215,11 +215,11 @@ describe Mongoid::Config do
 
         Mongoid.configure { |config| config.load_configuration(configuration) }
 
-        expect(Mongoid::Config.discriminator_key).to be("test")
+        expect(Mongoid::Config.discriminator_key).to eq("test")
       end
 
       it 'is set globally' do
-        expect(Mongoid.discriminator_key).to be("test")
+        expect(Mongoid.discriminator_key).to eq("test")
       end
     end
   end
@@ -260,74 +260,103 @@ describe Mongoid::Config do
       let(:conf) { CONFIG }
 
       it "it is set to its default" do
-        expect(Mongoid.send(option)).to be(default)
+        expect(Mongoid.send(option)).to eq(default)
       end
     end
   end
 
+  context 'when setting the map_big_decimal_to_decimal128 option in the config' do
+    let(:option) { :map_big_decimal_to_decimal128 }
+    let(:default) { true }
+
+    it_behaves_like "a config option"
+  end
+
+  context 'when setting the allow_bson5_decimal128 option in the config' do
+    min_bson_version '5.0'
+
+    let(:option) { :allow_bson5_decimal128 }
+    let(:default) { false }
+
+    it_behaves_like "a config option"
+  end
+
   context 'when setting the broken_updates option in the config' do
     let(:option) { :broken_updates }
-    let(:default) { true }
+    let(:default) { false }
 
     it_behaves_like "a config option"
   end
 
   context 'when setting the legacy_triple_equals option in the config' do
     let(:option) { :legacy_triple_equals }
-    let(:default) { true }
+    let(:default) { false }
 
     it_behaves_like "a config option"
   end
 
   context 'when setting the broken_scoping option in the config' do
     let(:option) { :broken_scoping }
-    let(:default) { true }
+    let(:default) { false }
 
     it_behaves_like "a config option"
   end
 
   context 'when setting the broken_aggregables option in the config' do
     let(:option) { :broken_aggregables }
-    let(:default) { true }
+    let(:default) { false }
 
     it_behaves_like "a config option"
   end
 
   context 'when setting the broken_alias_handling option in the config' do
     let(:option) { :broken_alias_handling }
-    let(:default) { true }
+    let(:default) { false }
 
     it_behaves_like "a config option"
   end
 
   context 'when setting the broken_and option in the config' do
     let(:option) { :broken_and }
-    let(:default) { true }
+    let(:default) { false }
 
     it_behaves_like "a config option"
   end
 
   context 'when setting the compare_time_by_ms option in the config' do
     let(:option) { :compare_time_by_ms }
-    let(:default) { false }
+    let(:default) { true }
 
     it_behaves_like "a config option"
   end
 
   context 'when setting the object_id_as_json_oid option in the config' do
     let(:option) { :object_id_as_json_oid }
-    let(:default) { true }
+    let(:default) { false }
 
     it_behaves_like "a config option"
   end
 
   context 'when setting the legacy_pluck_distinct option in the config' do
     let(:option) { :legacy_pluck_distinct }
-    let(:default) { true }
+    let(:default) { false }
+
+    it_behaves_like "a config option"
+  end
+
+  context 'when setting the overwrite_chained_operators option in the config' do
+    let(:option) { :overwrite_chained_operators }
+    let(:default) { false }
 
     it_behaves_like "a config option"
   end
 
+  context 'when setting the legacy_attributes option in the config' do
+    let(:option) { :legacy_attributes }
+    let(:default) { false }
+
+    it_behaves_like "a config option"
+  end
 
   describe "#load!" do
 
@@ -449,6 +478,40 @@ describe Mongoid::Config do
       end
     end
 
+    context "when provided an environment with driver options" do
+
+      before do
+        described_class.load!(file, :test)
+      end
+
+      after do
+        described_class.reset
+      end
+
+      it "sets the Mongo.broken_view_options option" do
+        expect(Mongo.broken_view_options).to eq(false)
+      end
+
+      it "does not override the unset Mongo.validate_update_replace option" do
+        expect(Mongo.validate_update_replace).to eq(false)
+      end
+    end
+
+    context "when provided an environment with a nil driver option" do
+
+      before do
+        described_class.load!(file, :test_nil)
+      end
+
+      after do
+        described_class.reset
+      end
+
+      it "sets the Mongo.broken_view_options option to nil" do
+        expect(Mongo.broken_view_options).to be_nil
+      end
+    end
+
     context "when the rack environment is set" do
 
       before do
@@ -543,12 +606,9 @@ describe Mongoid::Config do
 
       let(:client) { Mongoid.default_client }
 
-      # Wrapping libraries are only recognized by driver 2.13.0+.
-      min_driver_version '2.13'
-
       it 'passes uuid to driver' do
         Mongo::Client.should receive(:new).with(SpecConfig.instance.addresses,
-          auto_encryption_options: {
+          { auto_encryption_options: {
             'key_vault_namespace' => 'admin.datakeys',
             'kms_providers' => {'local' => {'key' => 'z7iYiYKLuYymEWtk4kfny1ESBwwFdA58qMqff96A8ghiOcIK75lJGPUIocku8LOFjQuEgeIP4xlln3s7r93FV9J5sAE7zg8U'}},
             'schema_map' => {'blog_development.comments' => {
@@ -565,7 +625,7 @@ describe Mongoid::Config do
           platform: "mongoid-#{Mongoid::VERSION}",
           wrapping_libraries: [
             {'name' => 'Mongoid', 'version' => Mongoid::VERSION},
-          ],
+          ]},
         )
 
         client