mongoid 6.4.8 → 7.5.4

data/spec/mongoid/clients/options_spec.rb

@@ -1,13 +1,24 @@
+# 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,
+    # 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
+  describe '#with' 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 +30,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 +51,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
 
@@ -63,17 +74,19 @@ describe Mongoid::Clients::Options do
         end
       end
 
-      context 'when passing a block', if: testing_locally? do
+      context 'when passing a block' 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 = nil
+          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']
+            cluster = Minim.collection.cluster
           end
           [ connections, cluster ]
         end
@@ -87,18 +100,20 @@ 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
+          # This test fails on sharded topologies in Evergreen but not locally
+          require_topology :single, :replica_set
 
           let(:options) do
             { connect_timeout: 2 }
@@ -110,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' }
@@ -122,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
 
@@ -134,8 +157,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 },
+                analytics: { uri: "mongodb://#{SpecConfig.instance.addresses.first}/analytics-db?connectTimeoutMS=3000" }
             }
           end
 
@@ -148,14 +171,14 @@ describe Mongoid::Clients::Options do
           end
 
           let(:persistence_context) do
-            Band.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
@@ -181,7 +204,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,12 +244,12 @@ describe Mongoid::Clients::Options do
           100.times do |i|
             threads << Thread.new do
               if i % 2 == 0
-                Band.with(collection: 'British') do |klass|
-                  klass.create(name: 'realised')
+                NameOnly.with(collection: 'British') do |klass|
+                  klass.create!(name: 'realised')
                 end
               else
-                Band.with(collection: 'American') do |klass|
-                  klass.create(name: 'realized')
+                NameOnly.with(collection: 'American') do |klass|
+                  klass.create!(name: 'realized')
                 end
               end
             end
@@ -235,13 +258,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          Band.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          Band.with(collection: 'American') do |klass|
+          NameOnly.with(collection: 'American') do |klass|
             klass.all.count
           end
         end
@@ -256,7 +279,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,14 +291,14 @@ 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
   end
 
-  describe '.with', if: non_legacy_server? do
+  describe '.with' do
 
     context 'when passing some options' do
 
@@ -283,12 +306,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 +321,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 +342,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 +350,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 },
+              analytics: {
+                uri: "mongodb://#{SpecConfig.instance.addresses.first}/analytics-db",
+                options: {
+                  server_selection_timeout: 0.5,
+                },
+              }
           }
         end
 
@@ -337,28 +365,28 @@ describe Mongoid::Clients::Options do
         end
 
         let(:persistence_context) do
-          band.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
 
-      context 'when passing a block', if: testing_locally? do
+      context 'when passing a block' 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
+        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,26 +401,29 @@ 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
+          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
@@ -401,6 +432,8 @@ describe Mongoid::Clients::Options do
         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 } }
 
@@ -431,15 +464,15 @@ describe Mongoid::Clients::Options do
         before do
           threads = []
           100.times do |i|
-            band = Band.create
+            test_model = NameOnly.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 +483,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          Band.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          Band.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
@@ -471,7 +504,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 +512,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

@@ -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
@@ -40,7 +37,8 @@ describe Mongoid::Clients::Sessions do
 
   context 'when a session is used on a model class' do
 
-    context 'when sessions are supported', if: sessions_supported? do
+    context 'when sessions are supported' do
+      min_server_version '3.6'
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -55,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
@@ -77,8 +75,8 @@ describe Mongoid::Clients::Sessions do
 
         before do
           Person.with_session do
-            Person.create
-            Person.create
+            Person.create!
+            Person.create!
           end
         end
 
@@ -97,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
@@ -118,12 +116,12 @@ 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
+                e = ex
             end
             e
           end
@@ -147,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,7 +167,8 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are not supported', unless: sessions_supported? do
+    context 'when sessions are not supported' do
+      max_server_version '3.4'
 
       let!(:error) do
         e = nil
@@ -192,11 +191,12 @@ describe Mongoid::Clients::Sessions do
 
     let!(:person) do
       Person.with(client: :other) do |klass|
-        klass.create
+        klass.create!
       end
     end
 
-    context 'when sessions are supported', if: sessions_supported? do
+    context 'when sessions are supported' do
+      min_server_version '3.6'
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -212,9 +212,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
 
@@ -235,8 +235,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
@@ -261,8 +261,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
@@ -290,8 +290,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
@@ -313,7 +313,8 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are not supported', unless: sessions_supported? do
+    context 'when sessions are not supported' do
+      max_server_version '3.4'
 
       let!(:error) do
         e = nil