mongoid 6.4.8 → 7.5.4

data/spec/mongoid/cacheable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Cacheable do
@@ -35,7 +37,7 @@ describe Mongoid::Cacheable do
     context "when persisted" do
 
       before do
-        document.save
+        document.save!
       end
 
       context "with updated_at" do
@@ -43,7 +45,7 @@ describe Mongoid::Cacheable do
         context "with the default cache_timestamp_format" do
 
           let!(:updated_at) do
-            document.updated_at.utc.to_s(:nsec)
+            document.updated_at.utc.to_formatted_s(:nsec)
           end
 
           it "has the id and updated_at key name" do
@@ -62,7 +64,7 @@ describe Mongoid::Cacheable do
           end
 
           let!(:updated_at) do
-            document.updated_at.utc.to_s(:number)
+            document.updated_at.utc.to_formatted_s(:number)
           end
 
           it "has the id and updated_at key name" do
@@ -101,7 +103,7 @@ describe Mongoid::Cacheable do
       end
 
       let!(:updated_at) do
-        agent.updated_at.utc.to_s(:nsec)
+        agent.updated_at.utc.to_formatted_s(:nsec)
       end
 
       it "has the id and updated_at key name" do

data/spec/mongoid/changeable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Changeable do
@@ -695,7 +697,7 @@ describe Mongoid::Changeable do
     context "when the document is embedded" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:name) do
@@ -737,7 +739,7 @@ describe Mongoid::Changeable do
       context "when the field has not changed" do
 
         let(:person) do
-          Person.create(map: { name: "value" })
+          Person.create!(map: { name: "value" })
         end
 
         before do
@@ -752,7 +754,7 @@ describe Mongoid::Changeable do
       context "when the field is changed" do
 
         let(:person) do
-          Person.create(map: { name: "value" })
+          Person.create!(map: { name: "value" })
         end
 
         before do
@@ -767,7 +769,7 @@ describe Mongoid::Changeable do
       context "when a dynamic field is changed in place" do
 
         let(:person) do
-          Person.create(other_name: { full: {first: 'first', last: 'last'} })
+          Person.create!(other_name: { full: {first: 'first', last: 'last'} })
         end
 
         before do
@@ -795,11 +797,11 @@ describe Mongoid::Changeable do
     context "when a child has changed" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:address) do
-        person.addresses.create(street: "hobrecht")
+        person.addresses.create!(street: "hobrecht")
       end
 
       before do
@@ -814,15 +816,15 @@ describe Mongoid::Changeable do
     context "when changed? has been called before child elements size change" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:address) do
-        person.addresses.create(street: "hobrecht")
+        person.addresses.create!(street: "hobrecht")
       end
 
       let!(:location) do
-        address.locations.create(name: "home")
+        address.locations.create!(name: "home")
       end
 
       before do
@@ -854,7 +856,7 @@ describe Mongoid::Changeable do
       context "when adding via create" do
 
         before do
-          address.locations.create
+          address.locations.create!
         end
 
         it "returns false" do
@@ -866,15 +868,15 @@ describe Mongoid::Changeable do
     context "when a deeply embedded child has changed" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:address) do
-        person.addresses.create(street: "hobrecht")
+        person.addresses.create!(street: "hobrecht")
       end
 
       let!(:location) do
-        address.locations.create(name: "home")
+        address.locations.create!(name: "home")
       end
 
       before do
@@ -889,7 +891,7 @@ describe Mongoid::Changeable do
     context "when a child is new" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let!(:address) do
@@ -904,11 +906,11 @@ describe Mongoid::Changeable do
     context "when a deeply embedded child is new" do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:address) do
-        person.addresses.create(street: "hobrecht")
+        person.addresses.create!(street: "hobrecht")
       end
 
       let!(:location) do
@@ -946,6 +948,29 @@ describe Mongoid::Changeable do
       end
     end
 
+    context 'when habtm association changes' do
+
+      let(:person) do
+        Person.create!(title: "Grand Poobah")
+      end
+
+      let(:user_account) do
+        UserAccount.create!
+      end
+
+      before do
+        person.user_accounts << user_account
+      end
+
+      it 'returns a hash of changes' do
+        pending 'https://jira.mongodb.org/browse/MONGOID-4843'
+
+        person.changes.should == {
+          user_account_ids: [[], [user_account.id]]
+        }
+      end
+    end
+
     context "when the document has not changed" do
 
       let(:acolyte) do
@@ -1234,7 +1259,7 @@ describe Mongoid::Changeable do
       context "when the document is persisted" do
 
         let(:person) do
-          Person.create(pets: true)
+          Person.create!(pets: true)
         end
 
         before do
@@ -1271,7 +1296,7 @@ describe Mongoid::Changeable do
       context "when the document is persisted" do
 
         let(:person) do
-          Person.create(title: "test")
+          Person.create!(title: "test")
         end
 
         before do
@@ -1369,7 +1394,7 @@ describe Mongoid::Changeable do
   context "when only embedded documents change" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     context "when the child is an embeds one" do
@@ -1428,7 +1453,7 @@ describe Mongoid::Changeable do
       context "when a child is modified" do
 
         let!(:address) do
-          person.addresses.create(street: "jakobstr.")
+          person.addresses.create!(street: "jakobstr.")
         end
 
         before do
@@ -1443,7 +1468,7 @@ describe Mongoid::Changeable do
       context "when no child is modified" do
 
         let!(:address) do
-          person.addresses.create(street: "skalitzerstr.")
+          person.addresses.create!(street: "skalitzerstr.")
         end
 
         it "does not flag the parent as changed" do
@@ -1456,7 +1481,7 @@ describe Mongoid::Changeable do
   context "when changing a hash of hashes" do
 
     let!(:person) do
-      Person.create(map: { "test" => {}})
+      Person.create!(map: { "test" => {}})
     end
 
     before do
@@ -1473,15 +1498,15 @@ describe Mongoid::Changeable do
   context "when modifying a many to many key" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let!(:preference) do
-      Preference.create(name: "dirty")
+      Preference.create!(name: "dirty")
     end
 
     before do
-      person.update_attributes(preference_ids: [ preference.id ])
+      person.update_attributes!(preference_ids: [ preference.id ])
     end
 
     it "records the foreign key dirty changes" do
@@ -1494,7 +1519,7 @@ describe Mongoid::Changeable do
   context "when accessing an array field" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let(:from_db) do
@@ -1520,7 +1545,7 @@ describe Mongoid::Changeable do
   context "when reloading an unchanged document" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let(:from_db) do
@@ -1539,7 +1564,7 @@ describe Mongoid::Changeable do
   context "when fields are getting changed" do
 
     let(:person) do
-      Person.create(
+      Person.create!(
         title: "MC",
         some_dynamic_field: 'blah'
       )
@@ -1619,7 +1644,7 @@ describe Mongoid::Changeable do
     context "when the document is persisted" do
 
       let!(:acolyte) do
-        Acolyte.create(name: "callback-test")
+        Acolyte.create!(name: "callback-test")
       end
 
       before do
@@ -1663,7 +1688,7 @@ describe Mongoid::Changeable do
       end
 
       it "retains the changes until after all callbacks" do
-        acolyte.save
+        acolyte.save!
         expect(acolyte.changed_in_callback["name"]).to eq([ nil, "callback-test" ])
       end
     end
@@ -1672,7 +1697,7 @@ describe Mongoid::Changeable do
   context "when associations are getting changed" do
 
     let(:person) do
-      Person.create(addresses: [ Address.new ])
+      Person.create!(addresses: [ Address.new ])
     end
 
     before do
@@ -1689,7 +1714,7 @@ describe Mongoid::Changeable do
     context 'when persisting the root document' do
 
       let!(:person) do
-        Person.create
+        Person.create!
       end
 
       it 'is not marked as changed' do
@@ -1713,7 +1738,7 @@ describe Mongoid::Changeable do
         context 'when building the lowest level document' do
 
           before do
-            person.save
+            person.save!
           end
 
           let!(:code) do
@@ -1735,7 +1760,7 @@ describe Mongoid::Changeable do
           context 'when saving the hierarchy' do
 
             before do
-              person.save
+              person.save!
             end
 
             let(:reloaded) do
@@ -1757,7 +1782,7 @@ describe Mongoid::Changeable do
               end
 
               before do
-                reloaded.save
+                reloaded.save!
               end
 
               it 'saves the deepest embedded document' do

data/spec/mongoid/clients/factory_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -37,11 +36,12 @@ describe Mongoid::Clients::Factory do
       context "when the configuration exists" do
 
         context "when the configuration is standard" do
+          restore_config_clients
 
           let(:config) do
             {
               default: { hosts: SpecConfig.instance.addresses, database: database_id },
-              secondary: { hosts: SpecConfig.instance.addresses, database: database_id }
+              analytics: { hosts: SpecConfig.instance.addresses, database: database_id }
             }
           end
 
@@ -54,7 +54,7 @@ describe Mongoid::Clients::Factory do
           end
 
           let(:client) do
-            described_class.create(:secondary)
+            described_class.create(:analytics)
           end
 
           let(:cluster) do
@@ -65,6 +65,17 @@ 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
+
+            it 'does not produce driver warnings' do
+              Mongo::Logger.logger.should_not receive(:warn)
+              client
+            end
+          end
+
           let(:cluster_addresses) do
             cluster.addresses.map(&:to_s)
           end
@@ -74,14 +85,47 @@ describe Mongoid::Clients::Factory do
           it "sets the platform to Mongoid's platform constant" 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
+
+            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'}],
+                    },
+                  }
+                }
+              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
         end
 
         context "when the configuration has no ports" do
+          restore_config_clients
 
           let(:config) do
             {
               default: { hosts: [ "127.0.0.1" ], database: database_id },
-              secondary: { hosts: [ "127.0.0.1" ], database: database_id }
+              analytics: { hosts: [ "127.0.0.1" ], database: database_id }
             }
           end
 
@@ -94,7 +138,7 @@ describe Mongoid::Clients::Factory do
           end
 
           let(:client) do
-            described_class.create(:secondary)
+            described_class.create(:analytics)
           end
 
           let(:default) do
@@ -121,11 +165,12 @@ describe Mongoid::Clients::Factory do
         context "when configured via a uri" do
 
           context "when the uri has a single host:port" do
+            restore_config_clients
 
             let(:config) do
               {
                 default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
-                secondary: { uri: "mongodb://127.0.0.1:27017/mongoid_test" }
+                analytics: { uri: "mongodb://127.0.0.1:27017/mongoid_test" }
               }
             end
 
@@ -138,7 +183,7 @@ describe Mongoid::Clients::Factory do
             end
 
             let(:client) do
-              described_class.create(:secondary)
+              described_class.create(:analytics)
             end
 
             let(:cluster) do
@@ -159,11 +204,12 @@ describe Mongoid::Clients::Factory do
           end
 
           context "when the uri has multiple host:port pairs" do
+            restore_config_clients
 
             let(:config) do
               {
                 default: { hosts: [ "127.0.0.1:1234" ], database: database_id, server_selection_timeout: 1 },
-                secondary: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/mongoid_test?serverSelectionTimeoutMS=1000" }
+                analytics: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/mongoid_test?serverSelectionTimeoutMS=1000" }
               }
             end
 
@@ -176,7 +222,7 @@ describe Mongoid::Clients::Factory do
             end
 
             let(:client) do
-              described_class.create(:secondary)
+              described_class.create(:analytics)
             end
 
             let(:cluster) do
@@ -209,6 +255,7 @@ describe Mongoid::Clients::Factory do
     end
 
     context "when no name is provided" do
+      restore_config_clients
 
       let(:config) do
         { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
@@ -242,6 +289,7 @@ describe Mongoid::Clients::Factory do
     end
 
     context "when nil is provided and no default config" do
+      restore_config_clients
 
       let(:config) { nil }
 
@@ -256,6 +304,7 @@ describe Mongoid::Clients::Factory do
   end
 
   describe ".default" do
+    restore_config_clients
 
     let(:config) do
       { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
@@ -289,6 +338,7 @@ describe Mongoid::Clients::Factory do
   end
 
   context "when options are provided with string keys" do
+    restore_config_clients
 
     let(:config) do
       {
@@ -341,4 +391,43 @@ describe Mongoid::Clients::Factory do
       expect(client.options[:platform]).to eq(Mongoid::PLATFORM_DETAILS)
     end
   end
+
+  context "unexpected config options" do
+    restore_config_clients
+
+    let(:unknown_opts) do
+      {
+        bad_one: 1,
+        another_one: "here"
+      }
+    end
+
+    let(:config) do
+      {
+        default: { hosts: SpecConfig.instance.addresses, database: database_id },
+        good_one: { hosts: [ "127.0.0.1:1234" ], database: database_id},
+        bad_one: { hosts: [ "127.0.0.1:1234" ], database: database_id}.merge(unknown_opts),
+        good_two: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/#{database_id}" },
+        bad_two: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/#{database_id}" }.merge(unknown_opts)
+      }
+    end
+
+    before do
+      Mongoid::Config.send(:clients=, config)
+    end
+
+    [:bad_one, :bad_two].each do |env|
+      it 'does not log a warning if none' do
+        expect(described_class.send(:default_logger)).not_to receive(:warn)
+        described_class.create(env).close
+      end
+    end
+
+    [:bad_one, :bad_two].each do |env|
+      it 'logs a warning if some' do
+        expect(described_class.send(:default_logger)).not_to receive(:warn)
+        described_class.create(env).close
+      end
+    end
+  end
 end