mongoid 6.4.2 → 7.0.3

data/spec/mongoid/clients/factory_spec.rb

@@ -12,8 +12,8 @@ describe Mongoid::Clients::Factory do
 
           let(:config) do
             {
-              default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
-              secondary: { hosts: [ "127.0.0.1:27017" ], database: database_id }
+              default: { hosts: SpecConfig.instance.addresses, database: database_id },
+              secondary: { hosts: SpecConfig.instance.addresses, database: database_id }
             }
           end
 
@@ -38,7 +38,7 @@ describe Mongoid::Clients::Factory do
           end
 
           it "sets the cluster's seeds" do
-            expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+            expect(cluster.addresses.first.to_s).to eq(SpecConfig.instance.addresses.first)
           end
 
           it "sets the platform to Mongoid's platform constant" do
@@ -80,11 +80,11 @@ describe Mongoid::Clients::Factory do
           end
 
           it "sets the cluster's seed ports to 27017" do
-            expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+            expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
           end
 
           it "sets ips with no ports to 27017" do
-            expect(default.cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+            expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
           end
         end
 
@@ -120,7 +120,7 @@ describe Mongoid::Clients::Factory do
             end
 
             it "sets the cluster's seeds" do
-              expect(cluster.addresses.first.to_s).to eq("127.0.0.1:27017")
+              expect(%w(127.0.0.1:27017 localhost:27017)).to include(cluster.addresses.first.to_s)
             end
 
             it "sets the database" do
@@ -181,7 +181,7 @@ describe Mongoid::Clients::Factory do
     context "when no name is provided" do
 
       let(:config) do
-        { default: { hosts: ["127.0.0.1:27017"], database: database_id }}
+        { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
       end
 
       before do
@@ -200,7 +200,7 @@ describe Mongoid::Clients::Factory do
         client.cluster
       end
 
-      let(:seeds) do
+      let(:cluster_addresses) do
         cluster.addresses.map{ |address| address.to_s }
       end
 
@@ -208,8 +208,10 @@ describe Mongoid::Clients::Factory do
         expect(client).to be_a(Mongo::Client)
       end
 
-      it "sets the cluster's seeds" do
-        expect(seeds).to eq([ "127.0.0.1:27017" ])
+      it "sets the cluster's addresses" do
+        SpecConfig.instance.addresses.each do |address|
+          expect(cluster_addresses).to include(address)
+        end
       end
     end
 
@@ -230,7 +232,7 @@ describe Mongoid::Clients::Factory do
   describe ".default" do
 
     let(:config) do
-      { default: { hosts: ["127.0.0.1:27017"], database: database_id }}
+      { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
     end
 
     before do
@@ -249,7 +251,7 @@ describe Mongoid::Clients::Factory do
       client.cluster
     end
 
-    let(:seeds) do
+    let(:cluster_addresses) do
       cluster.addresses.map{ |address| address.to_s }
     end
 
@@ -257,8 +259,10 @@ describe Mongoid::Clients::Factory do
       expect(client).to be_a(Mongo::Client)
     end
 
-    it "sets the cluster's seeds" do
-      expect(seeds).to eq([ "127.0.0.1:27017" ])
+    it "sets the cluster's addresses" do
+      SpecConfig.instance.addresses.each do |address|
+        expect(cluster_addresses).to include(address)
+      end
     end
   end
 
@@ -267,7 +271,7 @@ describe Mongoid::Clients::Factory do
     let(:config) do
       {
         default: {
-          hosts: [ "127.0.0.1:27017" ],
+          hosts: SpecConfig.instance.addresses,
           database: database_id,
           options: {
             "server_selection_timeout" => 10,
@@ -293,7 +297,7 @@ describe Mongoid::Clients::Factory do
       client.cluster
     end
 
-    let(:seeds) do
+    let(:cluster_addresses) do
       cluster.addresses.map{ |address| address.to_s }
     end
 
@@ -301,8 +305,10 @@ describe Mongoid::Clients::Factory do
       expect(client).to be_a(Mongo::Client)
     end
 
-    it "sets the cluster's seeds" do
-      expect(seeds).to eq([ "127.0.0.1:27017" ])
+    it "sets the cluster's addresses" do
+      SpecConfig.instance.addresses.each do |address|
+        expect(cluster_addresses).to include(address)
+      end
     end
 
     it "sets the server selection timeout" do

data/spec/mongoid/clients/options_spec.rb

@@ -2,12 +2,21 @@ require "spec_helper"
 
 describe Mongoid::Clients::Options do
 
+  before do
+    # This test asserts on numbers of open connections,
+    # to make these assertions work in jruby we cannot have connections
+    # bleeding from one test to another and this includes background SDAM
+    # threads in the driver
+    Mongoid.disconnect_clients
+    Mongoid::Clients.clients.clear
+  end
+
   describe '#with', if: non_legacy_server? do
 
     context 'when passing some options' do
 
       let(:persistence_context) do
-        Band.with(options) do |klass|
+        Minim.with(options) do |klass|
           klass.persistence_context
         end
       end
@@ -19,13 +28,13 @@ describe Mongoid::Clients::Options do
       end
 
       it 'does not set the options on class level' do
-        expect(Band.persistence_context.client.options['database']).to eq('mongoid_test')
+        expect(Minim.persistence_context.client.options['database']).to eq('mongoid_test')
       end
 
       context 'when the options are not valid mongo client options' do
 
         let(:persistence_context) do
-          Band.with(invalid_options) do |klass|
+          Minim.with(invalid_options) do |klass|
             klass.persistence_context
           end
         end
@@ -40,7 +49,7 @@ describe Mongoid::Clients::Options do
 
         it 'clears the persistence context' do
           begin; persistence_context; rescue Mongoid::Errors::InvalidPersistenceOption; end
-          expect(Band.persistence_context).to eq(Mongoid::PersistenceContext.new(Band))
+          expect(Minim.persistence_context).to eq(Mongoid::PersistenceContext.new(Minim))
         end
       end
 
@@ -66,14 +75,14 @@ describe Mongoid::Clients::Options do
       context 'when passing a block', if: testing_locally? do
 
         let!(:connections_before) do
-          Band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+          Minim.mongo_client.database.command(serverStatus: 1).first['connections']['current']
         end
 
         let!(:connections_and_cluster_during) do
           connections = nil
-          cluster = Band.with(options) do |klass|
+          cluster = Minim.with(options) do |klass|
             klass.where(name: 'emily').to_a
-            connections = Band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+            connections = Minim.mongo_client.database.command(serverStatus: 1).first['connections']['current']
           end
           [ connections, cluster ]
         end
@@ -87,15 +96,15 @@ describe Mongoid::Clients::Options do
         end
 
         let(:connections_after) do
-          Band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+          Minim.mongo_client.database.command(serverStatus: 1).first['connections']['current']
         end
 
         let!(:cluster_before) do
-          Band.persistence_context.cluster
+          Minim.persistence_context.cluster
         end
 
         let(:cluster_after) do
-          Band.persistence_context.cluster
+          Minim.persistence_context.cluster
         end
 
         context 'when the options create a new cluster' do
@@ -134,8 +143,8 @@ describe Mongoid::Clients::Options do
 
           let(:config) do
             {
-                default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
-                secondary: { uri: "mongodb://127.0.0.1:27017/secondary-db?connectTimeoutMS=3000" }
+                default: { hosts: SpecConfig.instance.addresses, database: database_id },
+                secondary: { uri: "mongodb://#{SpecConfig.instance.addresses.first}/secondary-db?connectTimeoutMS=3000" }
             }
           end
 
@@ -148,7 +157,7 @@ describe Mongoid::Clients::Options do
           end
 
           let(:persistence_context) do
-            Band.with(client: :secondary) do |klass|
+            Minim.with(client: :secondary) do |klass|
               klass.persistence_context
             end
           end
@@ -181,7 +190,7 @@ describe Mongoid::Clients::Options do
 
           let(:context_and_criteria) do
             collection = nil
-            cxt = Band.with(read_secondary_option) do |klass|
+            cxt = Minim.with(read_secondary_option) do |klass|
               collection = klass.all.collection
               klass.persistence_context
             end
@@ -221,11 +230,11 @@ describe Mongoid::Clients::Options do
           100.times do |i|
             threads << Thread.new do
               if i % 2 == 0
-                Band.with(collection: 'British') do |klass|
+                Minim.with(collection: 'British') do |klass|
                   klass.create(name: 'realised')
                 end
               else
-                Band.with(collection: 'American') do |klass|
+                Minim.with(collection: 'American') do |klass|
                   klass.create(name: 'realized')
                 end
               end
@@ -235,13 +244,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          Band.with(collection: 'British') do |klass|
+          Minim.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          Band.with(collection: 'American') do |klass|
+          Minim.with(collection: 'American') do |klass|
             klass.all.count
           end
         end
@@ -256,7 +265,7 @@ describe Mongoid::Clients::Options do
     context 'when passing a persistence context' do
 
       let(:instance) do
-        Band.new
+        Minim.new
       end
 
       let(:persistence_context) do
@@ -268,8 +277,8 @@ describe Mongoid::Clients::Options do
       let(:options) { { database: 'other' } }
 
       it 'sets the persistence context on the object' do
-        Band.new.with(persistence_context) do |band_instance|
-          expect(band_instance.persistence_context.options).to eq(persistence_context.options)
+        Minim.new.with(persistence_context) do |model_instance|
+          expect(model_instance.persistence_context.options).to eq(persistence_context.options)
         end
       end
     end
@@ -283,12 +292,12 @@ describe Mongoid::Clients::Options do
         { database: 'other' }
       end
 
-      let(:band) do
-        Band.create
+      let(:test_model) do
+        Minim.create
       end
 
       let(:persistence_context) do
-        band.with(options) do |object|
+        test_model.with(options) do |object|
           object.persistence_context
         end
       end
@@ -298,13 +307,13 @@ describe Mongoid::Clients::Options do
       end
 
       it 'does not set the options on instance level' do
-        expect(band.persistence_context.client.database.name).to eq('mongoid_test')
+        expect(test_model.persistence_context.client.database.name).to eq('mongoid_test')
       end
 
       context 'when the options are not valid mongo client options' do
 
         let(:persistence_context) do
-          band.with(invalid_options) do |object|
+          test_model.with(invalid_options) do |object|
             object.persistence_context
           end
         end
@@ -319,7 +328,7 @@ describe Mongoid::Clients::Options do
 
         it 'clears the persistence context' do
           begin; persistence_context; rescue Mongoid::Errors::InvalidPersistenceOption; end
-          expect(band.persistence_context).to eq(Mongoid::PersistenceContext.new(band))
+          expect(test_model.persistence_context).to eq(Mongoid::PersistenceContext.new(test_model))
         end
       end
 
@@ -327,8 +336,13 @@ describe Mongoid::Clients::Options do
 
         let(:config) do
           {
-              default: { hosts: [ "127.0.0.1:27017" ], database: database_id },
-              secondary: { uri: "mongodb://127.0.0.1:27017/secondary-db" }
+              default: { hosts: SpecConfig.instance.addresses, database: database_id },
+              secondary: {
+                uri: "mongodb://#{SpecConfig.instance.addresses.first}/secondary-db",
+                options: {
+                  server_selection_timeout: 0.5,
+                },
+              }
           }
         end
 
@@ -337,7 +351,7 @@ describe Mongoid::Clients::Options do
         end
 
         let(:persistence_context) do
-          band.with(client: :secondary) do |object|
+          test_model.with(client: :secondary) do |object|
             object.persistence_context
           end
         end
@@ -351,14 +365,14 @@ describe Mongoid::Clients::Options do
       context 'when passing a block', if: testing_locally? do
 
         let!(:connections_before) do
-          band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+          test_model.mongo_client.database.command(serverStatus: 1).first['connections']['current']
         end
 
         let!(:connections_and_cluster_during) do
           connections = nil
-          cluster = band.with(options) do |b|
+          cluster = test_model.with(options) do |b|
             b.reload
-            connections = band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+            connections = test_model.mongo_client.database.command(serverStatus: 1).first['connections']['current']
             b.persistence_context.cluster
           end
           [ connections, cluster ]
@@ -373,15 +387,15 @@ describe Mongoid::Clients::Options do
         end
 
         let(:connections_after) do
-          band.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+          test_model.mongo_client.database.command(serverStatus: 1).first['connections']['current']
         end
 
         let!(:cluster_before) do
-          band.persistence_context.cluster
+          test_model.persistence_context.cluster
         end
 
         let(:cluster_after) do
-          band.persistence_context.cluster
+          test_model.persistence_context.cluster
         end
 
         context 'when the options create a new cluster' do
@@ -431,15 +445,15 @@ describe Mongoid::Clients::Options do
         before do
           threads = []
           100.times do |i|
-            band = Band.create
+            test_model = Minim.create
             threads << Thread.new do
               if i % 2 == 0
-                band.with(collection: 'British') do |b|
+                test_model.with(collection: 'British') do |b|
                   b.name = 'realised'
                   b.upsert
                 end
               else
-                band.with(collection: 'American') do |b|
+                test_model.with(collection: 'American') do |b|
                   b.name = 'realized'
                   b.upsert
                 end
@@ -450,13 +464,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          Band.with(collection: 'British') do |klass|
+          Minim.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          Band.with(collection: 'British') do |klass|
+          Minim.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
@@ -471,7 +485,7 @@ describe Mongoid::Clients::Options do
     context 'when passing a persistence context' do
 
       let(:persistence_context) do
-        Band.with(options) do |klass|
+        Minim.with(options) do |klass|
           klass.persistence_context
         end
       end
@@ -479,8 +493,8 @@ describe Mongoid::Clients::Options do
       let(:options) { { database: 'other' } }
 
       it 'sets the persistence context on the object' do
-        Band.with(persistence_context) do |band_class|
-          expect(band_class.persistence_context.options).to eq(persistence_context.options)
+        Minim.with(persistence_context) do |test_model_class|
+          expect(test_model_class.persistence_context.options).to eq(persistence_context.options)
         end
       end
     end

data/spec/mongoid/clients/sessions_spec.rb

@@ -114,7 +114,7 @@ describe Mongoid::Clients::Sessions do
                 Post.create
               end
             rescue => ex
-              e = ex
+                e = ex
             end
             e
           end