mongo 2.12.4 → 2.13.0.beta1

data/spec/mongo/operation/find/legacy_spec.rb

@@ -59,7 +59,9 @@ describe Mongo::Operation::Find::Legacy do
     end
 
     let(:message) do
-      query.send(:message, authorized_primary)
+      authorized_primary.with_connection do |connection|
+        query.send(:message, connection)
+      end
     end
 
     it 'applies the correct flags' do
@@ -67,18 +69,34 @@ describe Mongo::Operation::Find::Legacy do
     end
 
     context 'when the server is a secondary' do
+      let(:description) do
+        double('description').tap do |description|
+          expect(description).to receive(:mongos?) { false }
+          expect(description).to receive(:standalone?) { false }
+        end
+      end
+
+      let(:connection) do
+        double('connection').tap do |conn|
+          expect(conn).to receive(:description).at_least(:once).and_return(description)
+        end
+      end
 
       let(:secondary_server_single) do
         double('secondary_server').tap do |server|
-          allow(server).to receive(:mongos?) { false }
-          allow(server).to receive(:standalone?) { false }
-          allow(server).to receive(:cluster) { cluster_single }
-          allow(server).to receive(:features) { authorized_primary.features }
+          expect(server).to receive(:with_connection).and_yield(connection)
+          expect(server).to receive(:cluster) { cluster_single }
         end
       end
 
       let(:message) do
-        query.send(:message, secondary_server_single)
+        secondary_server_single.with_connection do |connection|
+          query.send(:message, connection)
+        end
+      end
+
+      before do
+        allow(connection).to receive(:server) { secondary_server_single }
       end
 
       it 'applies the correct flags' do
@@ -97,7 +115,9 @@ describe Mongo::Operation::Find::Legacy do
       end
 
       it 'does not raise an exception' do
-        expect(op.execute(authorized_primary, client: nil)).to be_a(Mongo::Operation::Find::Legacy::Result)
+        authorized_primary.with_connection do |connection|
+          expect(op.execute(connection, client: nil)).to be_a(Mongo::Operation::Find::Legacy::Result)
+        end
       end
     end
   end

data/spec/mongo/operation/get_more_spec.rb

@@ -47,7 +47,12 @@ describe Mongo::Operation::GetMore::Legacy do
 
     it 'creates a get more wire protocol message with correct specs' do
       expect(Mongo::Protocol::GetMore).to receive(:new).with(SpecConfig.instance.test_db, TEST_COLL, to_return, cursor_id).and_call_original
-      begin; op.execute(authorized_primary, client: nil); rescue; end
+      begin
+        authorized_primary.with_connection do |connection|
+          op.execute(connection, client: nil)
+        end
+      rescue
+      end
     end
   end
 end

data/spec/mongo/operation/insert/bulk_spec.rb

@@ -99,7 +99,9 @@ describe Mongo::Operation::Insert do
       end
 
       let(:inserted_ids) do
-        op.bulk_execute(authorized_primary, client: nil).inserted_ids
+        authorized_primary.with_connection do |connection|
+          op.bulk_execute(connection, client: nil).inserted_ids
+        end
       end
 
       let(:collection_ids) do
@@ -128,7 +130,9 @@ describe Mongo::Operation::Insert do
       context 'when the insert succeeds' do
 
         let(:response) do
-          op.bulk_execute(authorized_primary, client: nil)
+          authorized_primary.with_connection do |connection|
+            op.bulk_execute(connection, client: nil)
+          end
         end
 
         it 'inserts the documents into the database' do
@@ -146,7 +150,9 @@ describe Mongo::Operation::Insert do
         end
 
         let(:response) do
-          op.bulk_execute(authorized_primary, client: nil)
+          authorized_primary.with_connection do |connection|
+            op.bulk_execute(connection, client: nil)
+          end
         end
 
         it 'inserts the documents into the database' do
@@ -183,7 +189,9 @@ describe Mongo::Operation::Insert do
         context 'when the insert fails' do
 
           it 'aborts after first error' do
-            failing_insert.bulk_execute(authorized_primary, client: nil)
+            authorized_primary.with_connection do |connection|
+              failing_insert.bulk_execute(connection, client: nil)
+            end
             expect(authorized_collection.find.count).to eq(1)
           end
         end
@@ -197,7 +205,9 @@ describe Mongo::Operation::Insert do
         context 'when the insert fails' do
 
           it 'aborts after first error' do
-            failing_insert.bulk_execute(authorized_primary, client: nil)
+            authorized_primary.with_connection do |connection|
+              failing_insert.bulk_execute(connection, client: nil)
+            end
             expect(authorized_collection.find.count).to eq(1)
           end
         end
@@ -228,7 +238,9 @@ describe Mongo::Operation::Insert do
         context 'when the insert fails' do
 
           it 'does not abort after first error' do
-            failing_insert.bulk_execute(authorized_primary, client: nil)
+            authorized_primary.with_connection do |connection|
+              failing_insert.bulk_execute(connection, client: nil)
+            end
             expect(authorized_collection.find.count).to eq(2)
           end
         end
@@ -243,7 +255,9 @@ describe Mongo::Operation::Insert do
         context 'when the insert fails' do
 
           it 'does not after first error' do
-            failing_insert.bulk_execute(authorized_primary, client: nil)
+            authorized_primary.with_connection do |connection|
+              failing_insert.bulk_execute(connection, client: nil)
+            end
             expect(authorized_collection.find.count).to eq(2)
           end
         end

data/spec/mongo/operation/insert/command_spec.rb

@@ -62,6 +62,8 @@ describe Mongo::Operation::Insert::Command do
   end
 
   describe 'write concern' do
+    # https://jira.mongodb.org/browse/RUBY-2224
+    skip_if_linting
 
     context 'when write concern is not specified' do
 
@@ -87,6 +89,8 @@ describe Mongo::Operation::Insert::Command do
   end
 
   describe '#message' do
+    # https://jira.mongodb.org/browse/RUBY-2224
+    skip_if_linting
 
     context 'when the server does not support OP_MSG' do
       max_server_version '3.4'

data/spec/mongo/operation/insert/op_msg_spec.rb

@@ -20,6 +20,15 @@ describe Mongo::Operation::Insert::OpMsg do
 
   let(:op) { described_class.new(spec) }
 
+  let(:connection) do
+    double('connection').tap do |connection|
+      allow(connection).to receive(:server).and_return(authorized_primary)
+      allow(connection).to receive(:features).and_return(authorized_primary.features)
+      allow(connection).to receive(:description).and_return(authorized_primary.description)
+      allow(connection).to receive(:cluster_time).and_return(authorized_primary.cluster_time)
+    end
+  end
+
   describe '#initialize' do
 
     context 'spec' do
@@ -62,6 +71,8 @@ describe Mongo::Operation::Insert::OpMsg do
   end
 
   describe 'write concern' do
+    # https://jira.mongodb.org/browse/RUBY-2224
+    skip_if_linting
 
     context 'when write concern is not specified' do
 
@@ -74,19 +85,21 @@ describe Mongo::Operation::Insert::OpMsg do
       end
 
       it 'does not include write concern in the selector' do
-        expect(op.send(:command, authorized_primary)[:writeConcern]).to be_nil
+        expect(op.send(:command, connection)[:writeConcern]).to be_nil
       end
     end
 
     context 'when write concern is specified' do
 
       it 'includes write concern in the selector' do
-        expect(op.send(:command, authorized_primary)[:writeConcern]).to eq(write_concern.options)
+        expect(op.send(:command, connection)[:writeConcern]).to eq(write_concern.options)
       end
     end
   end
 
   describe '#message' do
+    # https://jira.mongodb.org/browse/RUBY-2224
+    skip_if_linting
 
     context 'when the server supports OP_MSG' do
       min_server_fcv '3.6'
@@ -128,7 +141,7 @@ describe Mongo::Operation::Insert::OpMsg do
                                                                { validating_keys: true },
                                                                expected_global_args,
                                                                expected_payload_1)
-            op.send(:message, authorized_primary)
+            op.send(:message, connection)
           end
         end
       end
@@ -148,7 +161,7 @@ describe Mongo::Operation::Insert::OpMsg do
                                                                { validating_keys: true },
                                                                expected_global_args,
                                                                expected_payload_1)
-            op.send(:message, authorized_primary)
+            op.send(:message, connection)
           end
         end
 
@@ -164,23 +177,18 @@ describe Mongo::Operation::Insert::OpMsg do
 
           before do
             session.instance_variable_set(:@options, { implicit: true })
-            # Topology is standalone, hence there is exactly one server
-            authorized_primary.monitor.stop!
           end
 
           it 'creates the correct OP_MSG message' do
             RSpec::Mocks.with_temporary_scope do
-              # Override description as it gets replaced on every connection
-              description = authorized_primary.description
-              allow(authorized_primary).to receive(:description).and_return(description)
-              allow(description.features).to receive(:sessions_enabled?).and_return(false)
+              expect(connection.features).to receive(:sessions_enabled?).and_return(false)
 
               expect(expected_global_args).not_to have_key(:lsid)
               expect(Mongo::Protocol::Msg).to receive(:new).with([],
                                                                  { validating_keys: true },
                                                                  expected_global_args,
                                                                  expected_payload_1)
-              op.send(:message, authorized_primary)
+              op.send(:message, connection)
             end
           end
         end
@@ -217,7 +225,7 @@ describe Mongo::Operation::Insert::OpMsg do
                                                                    { validating_keys: true },
                                                                    expected_global_args,
                                                                    expected_payload_1)
-                op.send(:message, authorized_primary)
+                op.send(:message, connection)
               end
             end
           end
@@ -239,7 +247,7 @@ describe Mongo::Operation::Insert::OpMsg do
                                                                    { validating_keys: true },
                                                                    expected_global_args,
                                                                    expected_payload_1)
-                op.send(:message, authorized_primary)
+                op.send(:message, connection)
               end
             end
           end
@@ -267,7 +275,7 @@ describe Mongo::Operation::Insert::OpMsg do
                                                                  { validating_keys: true },
                                                                  expected_global_args,
                                                                  expected_payload_1)
-              op.send(:message, authorized_primary)
+              op.send(:message, connection)
             end
           end
         end

data/spec/mongo/operation/limited_spec.rb

@@ -11,6 +11,8 @@ describe Mongo::Operation::Limited do
       end.new({ :options => spec })
     end
 
+    let(:server) { double('server') }
+
     context 'when no limit is provided' do
 
       let(:spec) do
@@ -18,7 +20,7 @@ describe Mongo::Operation::Limited do
       end
 
       it 'returns a limit of -1' do
-        expect(limited.send(:options)).to eq({ :skip => 5, :limit => -1 })
+        expect(limited.send(:options, server)).to eq({ :skip => 5, :limit => -1 })
       end
     end
 
@@ -31,7 +33,7 @@ describe Mongo::Operation::Limited do
         end
 
         it 'returns a limit of -1' do
-          expect(limited.send(:options)).to eq({ :skip => 5, :limit => -1 })
+          expect(limited.send(:options, server)).to eq({ :skip => 5, :limit => -1 })
         end
       end
 
@@ -42,7 +44,7 @@ describe Mongo::Operation::Limited do
         end
 
         it 'returns a limit of -1' do
-          expect(limited.send(:options)).to eq({ :skip => 5, :limit => -1 })
+          expect(limited.send(:options, server)).to eq({ :skip => 5, :limit => -1 })
         end
       end
     end

data/spec/mongo/operation/read_preference_legacy_spec.rb

@@ -26,18 +26,30 @@ describe Mongo::Operation::ReadPreferenceSupported do
     end
   end
 
+  let(:description) do
+    double('description').tap do |description|
+      allow(description).to receive(:mongos?).and_return(mongos?)
+      allow(description).to receive(:standalone?).and_return(standalone?)
+    end
+  end
+
   let(:server) do
     double('server').tap do |server|
       allow(server).to receive(:cluster).and_return(cluster)
-      allow(server).to receive(:mongos?).and_return(mongos?)
-      allow(server).to receive(:standalone?).and_return(standalone?)
+    end
+  end
+
+  let(:connection) do
+    double('connection').tap do |connection|
+      allow(connection).to receive(:server).and_return(server)
+      allow(connection).to receive(:description).and_return(description)
     end
   end
 
   describe '#add_slave_ok_flag_maybe' do
 
     let(:actual) do
-      operation.send(:add_slave_ok_flag_maybe, operation.send(:options), server)
+      operation.send(:add_slave_ok_flag_maybe, operation.send(:options), connection)
     end
 
     shared_examples_for 'sets the slave_ok flag as expected' do
@@ -203,7 +215,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
     # Behavior of sending $readPreference is the same regardless of topology.
     shared_examples_for '$readPreference in the command' do
       let(:actual) do
-        operation.send(:update_selector_for_read_pref, operation.send(:selector), server)
+        operation.send(:update_selector_for_read_pref, operation.send(:selector), connection)
       end
 
       let(:expected_read_preference) do

data/spec/mongo/operation/read_preference_op_msg_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Mongo::Operation::SessionsSupported do
+  # https://jira.mongodb.org/browse/RUBY-2224
+  skip_if_linting
 
   let(:selector) do
     BSON::Document.new(name: 'test')
@@ -26,11 +28,23 @@ describe Mongo::Operation::SessionsSupported do
     end
   end
 
+  let(:description) do
+    double('description').tap do |description|
+      allow(description).to receive(:mongos?).and_return(mongos?)
+      allow(description).to receive(:standalone?).and_return(standalone?)
+    end
+  end
+
   let(:server) do
     double('server').tap do |server|
       allow(server).to receive(:cluster).and_return(cluster)
-      allow(server).to receive(:mongos?).and_return(mongos?)
-      allow(server).to receive(:standalone?).and_return(standalone?)
+    end
+  end
+
+  let(:connection) do
+    double('connection').tap do |connection|
+      allow(connection).to receive(:server).and_return(server)
+      allow(connection).to receive(:description).and_return(description)
     end
   end
 
@@ -42,7 +56,7 @@ describe Mongo::Operation::SessionsSupported do
 
     let(:actual) do
       sel = operation.send(:selector).dup
-      operation.send(:add_read_preference, sel, server)
+      operation.send(:add_read_preference, sel, connection)
       sel
     end
 
@@ -135,6 +149,53 @@ describe Mongo::Operation::SessionsSupported do
       end
     end
 
+    shared_examples_for 'sends read preference correctly for mongos' do
+      %i(primary_preferred secondary nearest).each do |_mode|
+        active_mode = _mode
+
+        context "when read preference mode is #{active_mode}" do
+          let(:mode) { active_mode }
+
+          it_behaves_like 'adds read preference'
+        end
+      end
+
+      context 'when read preference mode is primary' do
+        let(:mode) { 'primary' }
+        it_behaves_like 'does not modify selector'
+      end
+
+      context 'when read preference mode is secondary_preferred' do
+        let(:mode) { 'secondary_preferred' }
+
+        let(:read_pref) do
+          Mongo::ServerSelector.get(mode: mode, tag_sets: tag_sets)
+        end
+
+        let(:tag_sets) { nil }
+
+        context 'without tag_sets specified' do
+          it_behaves_like 'does not modify selector'
+        end
+
+        context 'with empty tag_sets' do
+          let(:tag_sets) { [] }
+
+          it_behaves_like 'does not modify selector'
+        end
+
+        context 'with tag_sets specified' do
+          let(:tag_sets) { [{ dc: 'ny' }] }
+
+          let(:expected_read_preference) do
+            { mode: 'secondaryPreferred', tags: tag_sets }
+          end
+
+          it_behaves_like 'adds read preference'
+        end
+      end
+    end
+
     context 'in single topology' do
       let(:single?) { true }
 
@@ -151,7 +212,7 @@ describe Mongo::Operation::SessionsSupported do
         let(:standalone?) { false }
         let(:mongos?) { true }
 
-        it_behaves_like 'changes read preference to allow secondary reads'
+        it_behaves_like 'sends read preference correctly for mongos'
       end
 
       context 'when the server is a replica set member' do
@@ -179,7 +240,56 @@ describe Mongo::Operation::SessionsSupported do
         let(:standalone?) { false }
         let(:mongos?) { true }
 
-        it_behaves_like 'sends user-specified read preference'
+        it_behaves_like 'sends read preference correctly for mongos'
+
+        context 'when read preference mode is secondary_preferred' do
+          let(:read_pref) do
+            Mongo::ServerSelector.get(
+              mode: mode,
+              tag_sets: tag_sets,
+              hedge: hedge
+            )
+          end
+
+          let(:mode) { 'secondary_preferred' }
+          let(:tag_sets) { nil }
+          let(:hedge) { nil }
+
+          context 'when tag_sets and hedge are not specified' do
+            it_behaves_like 'does not modify selector'
+          end
+
+          context 'when tag_sets are specified' do
+            let(:tag_sets) { [{ dc: 'ny' }] }
+
+            let(:expected_read_preference) do
+              { mode: 'secondaryPreferred', tags: tag_sets }
+            end
+
+            it_behaves_like 'adds read preference'
+          end
+
+          context 'when hedge is specified' do
+            let(:hedge) { { enabled: true } }
+
+            let(:expected_read_preference) do
+              { mode: 'secondaryPreferred', hedge: hedge }
+            end
+
+            it_behaves_like 'adds read preference'
+          end
+
+          context 'when hedge and tag_sets are specified' do
+            let(:hedge) { { enabled: true } }
+            let(:tag_sets) { [{ dc: 'ny' }] }
+
+            let(:expected_read_preference) do
+              { mode: 'secondaryPreferred', tags: tag_sets, hedge: hedge }
+            end
+
+            it_behaves_like 'adds read preference'
+          end
+        end
       end
 
       context 'when the server is a replica set member' do