mongoid 7.0.0 → 7.4.0

data/spec/mongoid/clients/options_spec.rb

@@ -1,24 +1,24 @@
-require "spec_helper"
+# frozen_string_literal: true
 
-describe Mongoid::Clients::Options do
+require "spec_helper"
 
-  before(:all) do
-    class TestModel
-      include Mongoid::Document
-      field :name
-    end
-  end
+describe Mongoid::Clients::Options, retry: 3 do
 
-  after(:all) do
-    Object.send(:remove_const, :TestModel)
+  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
-        TestModel.with(options) do |klass|
+        Minim.with(options) do |klass|
           klass.persistence_context
         end
       end
@@ -30,13 +30,13 @@ describe Mongoid::Clients::Options do
       end
 
       it 'does not set the options on class level' do
-        expect(TestModel.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
-          TestModel.with(invalid_options) do |klass|
+          Minim.with(invalid_options) do |klass|
             klass.persistence_context
           end
         end
@@ -51,7 +51,7 @@ describe Mongoid::Clients::Options do
 
         it 'clears the persistence context' do
           begin; persistence_context; rescue Mongoid::Errors::InvalidPersistenceOption; end
-          expect(TestModel.persistence_context).to eq(Mongoid::PersistenceContext.new(TestModel))
+          expect(Minim.persistence_context).to eq(Mongoid::PersistenceContext.new(Minim))
         end
       end
 
@@ -74,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
-          TestModel.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 = TestModel.with(options) do |klass|
+          cluster = nil
+          Minim.with(options) do |klass|
             klass.where(name: 'emily').to_a
-            connections = TestModel.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
@@ -98,18 +100,20 @@ describe Mongoid::Clients::Options do
         end
 
         let(:connections_after) do
-          TestModel.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+          Minim.mongo_client.database.command(serverStatus: 1).first['connections']['current']
         end
 
         let!(:cluster_before) do
-          TestModel.persistence_context.cluster
+          Minim.persistence_context.cluster
         end
 
         let(:cluster_after) do
-          TestModel.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 }
@@ -121,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' }
@@ -133,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
 
@@ -145,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
 
@@ -159,14 +171,14 @@ describe Mongoid::Clients::Options do
           end
 
           let(:persistence_context) do
-            TestModel.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
@@ -188,25 +200,40 @@ describe Mongoid::Clients::Options do
 
       context 'when returning a criteria' do
 
-        let(:context_and_criteria) do
-          collection = nil
-          cxt = TestModel.with(read: :secondary) do |klass|
-            collection = klass.all.collection
-            klass.persistence_context
+        shared_context 'applies secondary read preference' do
+
+          let(:context_and_criteria) do
+            collection = nil
+            cxt = Minim.with(read_secondary_option) do |klass|
+              collection = klass.all.collection
+              klass.persistence_context
+            end
+            [ cxt, collection ]
           end
-          [ cxt, collection ]
-        end
 
-        let(:persistence_context) do
-          context_and_criteria[0]
+          let(:persistence_context) do
+            context_and_criteria[0]
+          end
+
+          let(:client) do
+            context_and_criteria[1].client
+          end
+
+          it 'applies the options to the criteria client' do
+            expect(client.options['read']).to eq('mode' => :secondary)
+          end
         end
 
-        let(:client) do
-          context_and_criteria[1].client
+        context 'read: :secondary shorthand' do
+          let(:read_secondary_option) { {read: :secondary} }
+
+          it_behaves_like 'applies secondary read preference'
         end
 
-        it 'applies the options to the criteria client' do
-          expect(client.options['read']).to eq(:secondary)
+        context 'read: {mode: :secondary}' do
+          let(:read_secondary_option) { {read: {mode: :secondary}} }
+
+          it_behaves_like 'applies secondary read preference'
         end
       end
 
@@ -217,12 +244,12 @@ describe Mongoid::Clients::Options do
           100.times do |i|
             threads << Thread.new do
               if i % 2 == 0
-                TestModel.with(collection: 'British') do |klass|
-                  klass.create(name: 'realised')
+                NameOnly.with(collection: 'British') do |klass|
+                  klass.create!(name: 'realised')
                 end
               else
-                TestModel.with(collection: 'American') do |klass|
-                  klass.create(name: 'realized')
+                NameOnly.with(collection: 'American') do |klass|
+                  klass.create!(name: 'realized')
                 end
               end
             end
@@ -231,13 +258,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          TestModel.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          TestModel.with(collection: 'American') do |klass|
+          NameOnly.with(collection: 'American') do |klass|
             klass.all.count
           end
         end
@@ -252,7 +279,7 @@ describe Mongoid::Clients::Options do
     context 'when passing a persistence context' do
 
       let(:instance) do
-        TestModel.new
+        Minim.new
       end
 
       let(:persistence_context) do
@@ -264,14 +291,14 @@ describe Mongoid::Clients::Options do
       let(:options) { { database: 'other' } }
 
       it 'sets the persistence context on the object' do
-        TestModel.new.with(persistence_context) do |model_instance|
+        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
 
@@ -280,7 +307,7 @@ describe Mongoid::Clients::Options do
       end
 
       let(:test_model) do
-        TestModel.create
+        Minim.create!
       end
 
       let(:persistence_context) do
@@ -323,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
 
@@ -333,18 +365,18 @@ 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
 
-      context 'when passing a block', if: testing_locally? do
+      context 'when passing a block' do
 
         let!(:connections_before) do
           test_model.mongo_client.database.command(serverStatus: 1).first['connections']['current']
@@ -381,22 +413,26 @@ 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 }
           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 } }
 
@@ -427,7 +463,7 @@ describe Mongoid::Clients::Options do
         before do
           threads = []
           100.times do |i|
-            test_model = TestModel.create
+            test_model = NameOnly.create!
             threads << Thread.new do
               if i % 2 == 0
                 test_model.with(collection: 'British') do |b|
@@ -446,13 +482,13 @@ describe Mongoid::Clients::Options do
         end
 
         let(:british_count) do
-          TestModel.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
 
         let(:american_count) do
-          TestModel.with(collection: 'British') do |klass|
+          NameOnly.with(collection: 'British') do |klass|
             klass.all.count
           end
         end
@@ -467,7 +503,7 @@ describe Mongoid::Clients::Options do
     context 'when passing a persistence context' do
 
       let(:persistence_context) do
-        TestModel.with(options) do |klass|
+        Minim.with(options) do |klass|
           klass.persistence_context
         end
       end
@@ -475,7 +511,7 @@ describe Mongoid::Clients::Options do
       let(:options) { { database: 'other' } }
 
       it 'sets the persistence context on the object' do
-        TestModel.with(persistence_context) do |test_model_class|
+        Minim.with(persistence_context) do |test_model_class|
           expect(test_model_class.persistence_context.options).to eq(persistence_context.options)
         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
@@ -16,22 +18,27 @@ describe Mongoid::Clients::Sessions do
   end
 
   let(:subscriber) do
-    Mongoid::Clients.with_name(:other).instance_variable_get(:@monitoring).subscribers['Command'].find do |s|
+    client = Mongoid::Clients.with_name(:other)
+    monitoring = client.send(:monitoring)
+    monitoring.subscribers['Command'].find do |s|
       s.is_a?(EventSubscriber)
     end
   end
 
   let(:insert_events) do
-    subscriber.started_events.select { |event| event.command_name == :insert }
+    # Driver 2.5 sends command_name as a symbol
+    subscriber.started_events.select { |event| event.command_name.to_s == 'insert' }
   end
 
   let(:update_events) do
-    subscriber.started_events.select { |event| event.command_name == :update }
+    # Driver 2.5 sends command_name as a symbol
+    subscriber.started_events.select { |event| event.command_name.to_s == 'update' }
   end
 
   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)
@@ -46,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
@@ -68,8 +75,8 @@ describe Mongoid::Clients::Sessions do
 
         before do
           Person.with_session do
-            Person.create
-            Person.create
+            Person.create!
+            Person.create!
           end
         end
 
@@ -88,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
@@ -109,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
@@ -138,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
@@ -160,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
@@ -183,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)
@@ -203,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
 
@@ -226,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
@@ -252,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
@@ -281,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
@@ -304,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