mongoid 7.0.13 → 8.0.8

data/spec/mongoid/clients/factory_spec.rb

@@ -1,7 +1,34 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Clients::Factory do
 
+  shared_examples_for 'includes seed address' do
+    let(:configured_address) do
+      address = SpecConfig.instance.addresses.first
+      unless address.include?(':')
+        address = "#{address}:27017"
+      end
+      address
+    end
+
+    let(:expected_addresses) do
+      [
+        configured_address,
+        configured_address.sub(/\Alocalhost:/, '127.0.0.1:'),
+        configured_address.sub(/\A127\.0\.0\.1:/, 'localhost:'),
+      ].uniq
+    end
+
+    it 'includes seed address' do
+      ok = cluster_addresses.any? do |address|
+        expected_addresses.include?(address)
+      end
+      expect(ok).to be true
+    end
+  end
+
   describe ".create" do
 
     context "when provided a name" do
@@ -9,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
 
@@ -26,7 +54,7 @@ describe Mongoid::Clients::Factory do
           end
 
           let(:client) do
-            described_class.create(:secondary)
+            described_class.create(:analytics)
           end
 
           let(:cluster) do
@@ -37,21 +65,60 @@ describe Mongoid::Clients::Factory do
             expect(client).to be_a(Mongo::Client)
           end
 
-          it "sets the cluster's seeds" do
-            expect(cluster.addresses.first.to_s).to eq(SpecConfig.instance.addresses.first)
+          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)
+              client
+            end
+          end
+
+          let(:cluster_addresses) do
+            cluster.addresses.map(&:to_s)
           end
 
+          it_behaves_like 'includes seed address'
+
           it "sets the platform to Mongoid's platform constant" do
             expect(client.options[:platform]).to eq(Mongoid::PLATFORM_DETAILS)
           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
+
+            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
 
         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
 
@@ -64,7 +131,7 @@ describe Mongoid::Clients::Factory do
           end
 
           let(:client) do
-            described_class.create(:secondary)
+            described_class.create(:analytics)
           end
 
           let(:default) do
@@ -91,11 +158,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
 
@@ -108,7 +176,7 @@ describe Mongoid::Clients::Factory do
             end
 
             let(:client) do
-              described_class.create(:secondary)
+              described_class.create(:analytics)
             end
 
             let(:cluster) do
@@ -129,11 +197,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
 
@@ -146,7 +215,7 @@ describe Mongoid::Clients::Factory do
             end
 
             let(:client) do
-              described_class.create(:secondary)
+              described_class.create(:analytics)
             end
 
             let(:cluster) do
@@ -179,6 +248,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 }}
@@ -201,21 +271,18 @@ describe Mongoid::Clients::Factory do
       end
 
       let(:cluster_addresses) do
-        cluster.addresses.map{ |address| address.to_s }
+        cluster.addresses.map(&:to_s)
       end
 
       it "returns the default client" do
         expect(client).to be_a(Mongo::Client)
       end
 
-      it "sets the cluster's addresses" do
-        SpecConfig.instance.addresses.each do |address|
-          expect(cluster_addresses).to include(address)
-        end
-      end
+      it_behaves_like 'includes seed address'
     end
 
     context "when nil is provided and no default config" do
+      restore_config_clients
 
       let(:config) { nil }
 
@@ -230,6 +297,7 @@ describe Mongoid::Clients::Factory do
   end
 
   describe ".default" do
+    restore_config_clients
 
     let(:config) do
       { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
@@ -252,21 +320,18 @@ describe Mongoid::Clients::Factory do
     end
 
     let(:cluster_addresses) do
-      cluster.addresses.map{ |address| address.to_s }
+      cluster.addresses.map(&:to_s)
     end
 
     it "returns the default client" do
       expect(client).to be_a(Mongo::Client)
     end
 
-    it "sets the cluster's addresses" do
-      SpecConfig.instance.addresses.each do |address|
-        expect(cluster_addresses).to include(address)
-      end
-    end
+    it_behaves_like 'includes seed address'
   end
 
   context "when options are provided with string keys" do
+    restore_config_clients
 
     let(:config) do
       {
@@ -298,18 +363,14 @@ describe Mongoid::Clients::Factory do
     end
 
     let(:cluster_addresses) do
-      cluster.addresses.map{ |address| address.to_s }
+      cluster.addresses.map(&:to_s)
     end
 
     it "returns the default client" do
       expect(client).to be_a(Mongo::Client)
     end
 
-    it "sets the cluster's addresses" do
-      SpecConfig.instance.addresses.each do |address|
-        expect(cluster_addresses).to include(address)
-      end
-    end
+    it_behaves_like 'includes seed address'
 
     it "sets the server selection timeout" do
       expect(cluster.options[:server_selection_timeout]).to eq(10)
@@ -323,4 +384,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

data/spec/mongoid/clients/options_spec.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
-describe Mongoid::Clients::Options do
+describe Mongoid::Clients::Options, retry: 3 do
 
   before do
     # This test asserts on numbers of open connections,
@@ -80,9 +82,11 @@ describe Mongoid::Clients::Options do
 
         let!(:connections_and_cluster_during) do
           connections = nil
-          cluster = Minim.with(options) do |klass|
+          cluster = nil
+          Minim.with(options) do |klass|
             klass.where(name: 'emily').to_a
             connections = Minim.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+            cluster = Minim.collection.cluster
           end
           [ connections, cluster ]
         end
@@ -108,6 +112,8 @@ describe Mongoid::Clients::Options do
         end
 
         context 'when the options create a new cluster' do
+          # This test fails on sharded topologies in Evergreen but not locally
+          require_topology :single, :replica_set
 
           let(:options) do
             { connect_timeout: 2 }
@@ -119,11 +125,16 @@ describe Mongoid::Clients::Options do
           end
 
           it 'disconnects the new cluster when the block exits' do
-            expect(connections_before).to eq(connections_after)
+            expect(cluster_after).not_to be(cluster_during)
+
+            cluster_during.connected?.should be false
+            cluster_before.connected?.should be true
           end
         end
 
         context 'when the options do not create a new cluster' do
+          # This test fails on sharded topologies in Evergreen but not locally
+          require_topology :single, :replica_set
 
           let(:options) do
             { database: 'same-cluster' }
@@ -131,11 +142,14 @@ describe Mongoid::Clients::Options do
 
           it 'does not create a new cluster' do
             expect(connections_during).to eq(connections_before)
+
+            cluster_during.should be cluster_before
           end
 
           it 'does not disconnect the original cluster' do
-            expect(connections_after).to eq(connections_before)
             expect(cluster_before).to be(cluster_after)
+
+            cluster_before.connected?.should be true
           end
         end
 
@@ -144,7 +158,7 @@ describe Mongoid::Clients::Options do
           let(:config) do
             {
                 default: { hosts: SpecConfig.instance.addresses, database: database_id },
-                secondary: { uri: "mongodb://#{SpecConfig.instance.addresses.first}/secondary-db?connectTimeoutMS=3000" }
+                analytics: { uri: "mongodb://#{SpecConfig.instance.addresses.first}/analytics-db?connectTimeoutMS=3000" }
             }
           end
 
@@ -157,14 +171,14 @@ describe Mongoid::Clients::Options do
           end
 
           let(:persistence_context) do
-            Minim.with(client: :secondary) do |klass|
+            Minim.with(client: :analytics) do |klass|
               klass.persistence_context
             end
           end
 
           it 'uses the database specified in the uri' do
-            expect(persistence_context.database_name).to eq('secondary-db')
-            expect(persistence_context.client.database.name).to eq('secondary-db')
+            expect(persistence_context.database_name).to eq('analytics-db')
+            expect(persistence_context.client.database.name).to eq('analytics-db')
           end
 
           it 'uses the options specified in the uri' do
@@ -230,12 +244,12 @@ describe Mongoid::Clients::Options do
           100.times do |i|
             threads << Thread.new do
               if i % 2 == 0
-                Minim.with(collection: 'British') do |klass|
-                  klass.create(name: 'realised')
+                NameOnly.with(collection: 'British') do |klass|
+                  klass.create!(name: 'realised')
                 end
               else
-                Minim.with(collection: 'American') do |klass|
-                  klass.create(name: 'realized')
+                NameOnly.with(collection: 'American') do |klass|
+                  klass.create!(name: 'realized')
                 end
               end
             end
@@ -244,13 +258,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          Minim.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          Minim.with(collection: 'American') do |klass|
+          NameOnly.with(collection: 'American') do |klass|
             klass.all.count
           end
         end
@@ -293,7 +307,7 @@ describe Mongoid::Clients::Options do
       end
 
       let(:test_model) do
-        Minim.create
+        Minim.create!
       end
 
       let(:persistence_context) do
@@ -337,8 +351,8 @@ describe Mongoid::Clients::Options do
         let(:config) do
           {
               default: { hosts: SpecConfig.instance.addresses, database: database_id },
-              secondary: {
-                uri: "mongodb://#{SpecConfig.instance.addresses.first}/secondary-db",
+              analytics: {
+                uri: "mongodb://#{SpecConfig.instance.addresses.first}/analytics-db",
                 options: {
                   server_selection_timeout: 0.5,
                 },
@@ -351,14 +365,14 @@ describe Mongoid::Clients::Options do
         end
 
         let(:persistence_context) do
-          test_model.with(client: :secondary) do |object|
+          test_model.with(client: :analytics) do |object|
             object.persistence_context
           end
         end
 
         it 'uses the database specified in the uri' do
-          expect(persistence_context.database_name).to eq('secondary-db')
-          expect(persistence_context.client.database.name).to eq('secondary-db')
+          expect(persistence_context.database_name).to eq('analytics-db')
+          expect(persistence_context.client.database.name).to eq('analytics-db')
         end
       end
 
@@ -399,22 +413,27 @@ describe Mongoid::Clients::Options 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
 
           let(:options) do
             { connect_timeout: 2 }
           end
 
           it 'creates a new cluster' do
-            expect(connections_before).to be <(connections_during)
-            expect(cluster_before).not_to be(cluster_during)
+            expect(connections_during).to be > connections_before
+            expect(cluster_during).not_to be(cluster_before)
           end
 
           it 'disconnects the new cluster when the block exits' do
-            expect(connections_before).to eq(connections_after)
+            expect(connections_after).to eq(connections_before)
           end
         end
 
         context 'when the options do not create a new cluster' do
+          # This test fails on sharded topologies in Evergreen but not locally
+          require_topology :single, :replica_set
 
           let(:options) { { read: :secondary } }
 
@@ -445,7 +464,7 @@ describe Mongoid::Clients::Options do
         before do
           threads = []
           100.times do |i|
-            test_model = Minim.create
+            test_model = NameOnly.create!
             threads << Thread.new do
               if i % 2 == 0
                 test_model.with(collection: 'British') do |b|
@@ -464,13 +483,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          Minim.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          Minim.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end

data/spec/mongoid/clients/sessions_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Clients::Sessions do
@@ -17,12 +19,7 @@ describe Mongoid::Clients::Sessions do
 
   let(:subscriber) do
     client = Mongoid::Clients.with_name(:other)
-    monitoring = if client.respond_to?(:monitoring, true)
-      client.send(:monitoring)
-    else
-      # driver 2.5
-      client.instance_variable_get('@monitoring')
-    end
+    monitoring = client.send(:monitoring)
     monitoring.subscribers['Command'].find do |s|
       s.is_a?(EventSubscriber)
     end
@@ -56,10 +53,10 @@ describe Mongoid::Clients::Sessions do
 
         let!(:last_use_diff) do
           Person.with_session do |session|
-            Person.create
-            Person.create
+            Person.create!
+            Person.create!
             last_use = session.instance_variable_get(:@server_session).last_use
-            Thread.new { Person.create }.value
+            Thread.new { Person.create! }.value
             session.instance_variable_get(:@server_session).last_use - last_use
           end
         end
@@ -78,8 +75,8 @@ describe Mongoid::Clients::Sessions do
 
         before do
           Person.with_session do
-            Person.create
-            Person.create
+            Person.create!
+            Person.create!
           end
         end
 
@@ -98,9 +95,9 @@ describe Mongoid::Clients::Sessions do
           before do
             Post.with(client: :other) do
               Person.with_session do
-                Person.create
-                Person.create
-                Post.create
+                Person.create!
+                Person.create!
+                Post.create!
               end
             end
           end
@@ -119,9 +116,9 @@ describe Mongoid::Clients::Sessions do
             e = nil
             begin
               Person.with_session do
-                Person.create
-                Person.create
-                Post.create
+                Person.create!
+                Person.create!
+                Post.create!
               end
             rescue => ex
                 e = ex
@@ -148,8 +145,8 @@ describe Mongoid::Clients::Sessions do
             begin
               Person.with_session do
                 Person.with_session do
-                  Person.create
-                  Post.create
+                  Person.create!
+                  Post.create!
                 end
               end
             rescue => ex
@@ -169,32 +166,13 @@ 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
 
     let!(:person) do
       Person.with(client: :other) do |klass|
-        klass.create
+        klass.create!
       end
     end
 
@@ -215,9 +193,9 @@ describe Mongoid::Clients::Sessions do
         before do
           person.with_session do
             person.username = 'Emily'
-            person.save
+            person.save!
             person.age = 80
-            person.save
+            person.save!
           end
         end
 
@@ -238,8 +216,8 @@ describe Mongoid::Clients::Sessions do
             Post.with(client: :other) do
               person.with_session do
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
               end
             end
           end
@@ -264,8 +242,8 @@ describe Mongoid::Clients::Sessions do
             begin
               person.with_session do
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
               end
             rescue => ex
               e = ex
@@ -293,8 +271,8 @@ describe Mongoid::Clients::Sessions do
               person.with_session do
                 person.with_session do
                   person.username = 'Emily'
-                  person.save
-                  person.posts << Post.create
+                  person.save!
+                  person.posts << Post.create!
                 end
               end
             rescue => ex
@@ -315,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