mongo 2.11.2 → 2.13.0.beta1

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

@@ -20,6 +20,15 @@ describe Mongo::Operation::Delete::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::Delete::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::Delete::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
 
@@ -101,12 +114,7 @@ describe Mongo::Operation::Delete::OpMsg do
       end
 
       let(:expected_payload_1) do
-        {
-            type: 1,
-            payload: { identifier: 'deletes',
-                       sequence: deletes
-            }
-        }
+        Mongo::Protocol::Msg::Section1.new('deletes', deletes)
       end
 
       let(:session) do
@@ -124,7 +132,7 @@ describe Mongo::Operation::Delete::OpMsg do
         it 'creates the correct OP_MSG message' do
           authorized_client.command(ping:1)
           expect(Mongo::Protocol::Msg).to receive(:new).with([], {}, expected_global_args, expected_payload_1)
-          op.send(:message, authorized_primary)
+          op.send(:message, connection)
         end
       end
 
@@ -139,7 +147,7 @@ describe Mongo::Operation::Delete::OpMsg do
         it 'creates the correct OP_MSG message' do
           authorized_client.command(ping:1)
           expect(Mongo::Protocol::Msg).to receive(:new).with([], {}, expected_global_args, expected_payload_1)
-          op.send(:message, authorized_primary)
+          op.send(:message, connection)
         end
 
         context 'when an implicit session is created and the topology is then updated and the server does not support sessions' do
@@ -154,20 +162,15 @@ describe Mongo::Operation::Delete::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[:session]).to be nil
               expect(Mongo::Protocol::Msg).to receive(:new).with([], {}, expected_global_args, expected_payload_1)
-              op.send(:message, authorized_primary)
+              op.send(:message, connection)
             end
           end
         end
@@ -200,7 +203,7 @@ describe Mongo::Operation::Delete::OpMsg do
             it 'does not send a session id in the command' do
               authorized_client.command(ping:1)
               expect(Mongo::Protocol::Msg).to receive(:new).with([:more_to_come], {}, expected_global_args, expected_payload_1)
-              op.send(:message, authorized_primary)
+              op.send(:message, connection)
             end
           end
 
@@ -217,7 +220,7 @@ describe Mongo::Operation::Delete::OpMsg do
             it 'creates the correct OP_MSG message' do
               authorized_client.command(ping:1)
               expect(Mongo::Protocol::Msg).to receive(:new).with([:more_to_come], {}, expected_global_args, expected_payload_1)
-              op.send(:message, authorized_primary)
+              op.send(:message, connection)
             end
           end
         end
@@ -241,7 +244,7 @@ describe Mongo::Operation::Delete::OpMsg do
             authorized_client.command(ping:1)
             RSpec::Mocks.with_temporary_scope do
               expect(Mongo::Protocol::Msg).to receive(:new).with([:more_to_come], {}, expected_global_args, expected_payload_1)
-              op.send(:message, authorized_primary)
+              op.send(:message, connection)
             end
           end
         end

data/spec/mongo/operation/delete_spec.rb

@@ -103,7 +103,7 @@ describe Mongo::Operation::Delete do
         end
 
         let(:result) do
-          delete.execute(authorized_primary)
+          delete.execute(authorized_primary, client: nil)
         end
 
         it 'deletes the documents from the database' do
@@ -123,7 +123,7 @@ describe Mongo::Operation::Delete do
 
         it 'raises an exception' do
           expect {
-            delete.execute(authorized_primary)
+            delete.execute(authorized_primary, client: nil)
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
@@ -147,7 +147,7 @@ describe Mongo::Operation::Delete do
         end
 
         let(:result) do
-          delete.execute(authorized_primary)
+          delete.execute(authorized_primary, client: nil)
         end
 
         it 'deletes the documents from the database' do
@@ -166,13 +166,13 @@ describe Mongo::Operation::Delete do
         end
 
         let(:result) do
-          delete.execute(authorized_primary)
+          delete.execute(authorized_primary, client: nil)
         end
 
         it 'does not delete any documents' do
 
           expect {
-            op.execute(authorized_primary)
+            op.execute(authorized_primary, client: nil)
           }.to raise_error(Mongo::Error::OperationFailure)
 
           expect(authorized_collection.find.count).to eq(2)
@@ -187,7 +187,7 @@ describe Mongo::Operation::Delete do
 
         it 'raises an error' do
           expect {
-            op.execute(authorized_primary)
+            op.execute(authorized_primary, client: nil)
           }.to raise_error(Mongo::Error::MaxBSONSize)
         end
       end
@@ -211,7 +211,7 @@ describe Mongo::Operation::Delete do
       end
 
       let(:result) do
-        delete.execute(authorized_primary)
+        delete.execute(authorized_primary, client: nil)
       end
 
       before do

data/spec/mongo/operation/drop_index_spec.rb

@@ -26,7 +26,7 @@ describe Mongo::Operation::DropIndex do
       end
 
       let(:response) do
-        operation.execute(authorized_primary)
+        operation.execute(authorized_primary, client: nil)
       end
 
       it 'removes the index' do
@@ -46,7 +46,7 @@ describe Mongo::Operation::DropIndex do
 
       it 'raises an exception' do
         expect {
-          operation.execute(authorized_primary)
+          operation.execute(authorized_primary, client: nil)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end

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,17 +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(: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
@@ -96,7 +115,9 @@ describe Mongo::Operation::Find::Legacy do
       end
 
       it 'does not raise an exception' do
-        expect(op.execute(authorized_primary)).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); rescue; end
+      begin
+        authorized_primary.with_connection do |connection|
+          op.execute(connection, client: nil)
+        end
+      rescue
+      end
     end
   end
 end

data/spec/mongo/operation/indexes_spec.rb

@@ -24,7 +24,7 @@ describe Mongo::Operation::Indexes do
     end
 
     let(:indexes) do
-      operation.execute(authorized_primary)
+      operation.execute(authorized_primary, client: nil)
     end
 
     it 'returns the indexes for the collection' do

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).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)
+          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)
+          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)
+            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)
+            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)
+            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)
+            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'
@@ -106,12 +119,7 @@ describe Mongo::Operation::Insert::OpMsg do
       end
 
       let!(:expected_payload_1) do
-        {
-            type: 1,
-            payload: { identifier: 'documents',
-                       sequence: op.documents
-            }
-        }
+        Mongo::Protocol::Msg::Section1.new('documents', op.documents)
       end
 
       let(:session) do
@@ -133,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
@@ -153,11 +161,13 @@ 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
 
         context 'when an implicit session is created and the topology is then updated and the server does not support sessions' do
+          # Mocks on features are incompatible with linting
+          skip_if_linting
 
           let(:expected_global_args) do
             global_args.dup.tap do |args|
@@ -167,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
@@ -220,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
@@ -242,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
@@ -270,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