mongo 2.11.4 → 2.12.3

data/spec/mongo/error/no_server_available_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lite_spec_helper'
 
 describe Mongo::Error::NoServerAvailable do
   describe 'message' do
@@ -18,5 +18,15 @@ describe Mongo::Error::NoServerAvailable do
     it 'is correct' do
       expect(error.message).to eq('No primary server is available in cluster: #<Cluster topology=Unknown[127.0.0.1:27017] servers=[#<Server address=127.0.0.1:27017 UNKNOWN>]> with timeout=30, LT=0.015')
     end
+
+    context 'when cluster is nil' do
+      let(:error) do
+        Mongo::Error::NoServerAvailable.new(selector, nil)
+      end
+
+      it 'is correct' do
+        expect(error.message).to eq('No primary server is available with timeout=30, LT=0.015')
+      end
+    end
   end
 end

data/spec/mongo/error/notable_spec.rb

@@ -0,0 +1,59 @@
+require 'lite_spec_helper'
+
+describe Mongo::Error::Notable do
+  let(:exception_cls) do
+    # Since Notable is a module, we need a class that includes it for testing
+    Mongo::Error
+  end
+
+  context 'when there are no notes' do
+    let(:exception) do
+      exception_cls.new('hello world')
+    end
+
+    describe '#message' do
+      it 'is correct' do
+        exception.message.should == 'hello world'
+      end
+    end
+
+    describe '#to_s' do
+      it 'is correct' do
+        exception.to_s.should == 'hello world'
+      end
+    end
+
+    describe '#inspect' do
+      it 'is correct' do
+        exception.inspect.should == '#<Mongo::Error: hello world>'
+      end
+    end
+  end
+
+  context 'when there are notes' do
+    let(:exception) do
+      exception_cls.new('hello world').tap do |exception|
+        exception.add_note('brilliant')
+        exception.add_note('weird')
+      end
+    end
+
+    describe '#message' do
+      it 'is correct' do
+        exception.message.should == 'hello world (brilliant, weird)'
+      end
+    end
+
+    describe '#to_s' do
+      it 'is correct' do
+        exception.to_s.should == 'hello world (brilliant, weird)'
+      end
+    end
+
+    describe '#inspect' do
+      it 'is correct' do
+        exception.inspect.should == '#<Mongo::Error: hello world (brilliant, weird)>'
+      end
+    end
+  end
+end

data/spec/mongo/error/operation_failure_spec.rb

@@ -72,7 +72,7 @@ describe Mongo::Error::OperationFailure do
     context 'when there is a network error' do
       context 'getMore' do
         let(:error) { Mongo::Error::OperationFailure.new('problem: socket exception',
-          Mongo::Operation::GetMore::Result.new([])) }
+          Mongo::Operation::GetMore::Result.new(nil)) }
 
         it 'returns true' do
           expect(error.change_stream_resumable?).to be true
@@ -91,7 +91,7 @@ describe Mongo::Error::OperationFailure do
     context 'when there is a resumable message' do
       context 'getMore response' do
         let(:error) { Mongo::Error::OperationFailure.new('problem: node is recovering',
-          Mongo::Operation::GetMore::Result.new([])) }
+          Mongo::Operation::GetMore::Result.new(nil)) }
 
         it 'returns true' do
           expect(error.change_stream_resumable?).to eql(true)
@@ -110,7 +110,7 @@ describe Mongo::Error::OperationFailure do
     context 'when there is a resumable code' do
       context 'getMore response' do
         let(:error) { Mongo::Error::OperationFailure.new('no message',
-          Mongo::Operation::GetMore::Result.new([]),
+          Mongo::Operation::GetMore::Result.new(nil),
           :code => 91, :code_name => 'ShutdownInProgress') }
 
         it 'returns true' do
@@ -131,7 +131,7 @@ describe Mongo::Error::OperationFailure do
     context 'when there is a non-resumable code' do
       context 'getMore response' do
         let(:error) { Mongo::Error::OperationFailure.new('no message',
-          Mongo::Operation::GetMore::Result.new([]),
+          Mongo::Operation::GetMore::Result.new(nil),
           :code => 136, :code_name => 'CappedPositionLost') }
 
         it 'returns false' do
@@ -152,7 +152,7 @@ describe Mongo::Error::OperationFailure do
     context 'when there is a non-resumable label' do
       context 'getMore response' do
         let(:error) { Mongo::Error::OperationFailure.new('no message',
-          Mongo::Operation::GetMore::Result.new([]),
+          Mongo::Operation::GetMore::Result.new(nil),
           :code => 91, :code_name => 'ShutdownInProgress',
           :labels => ['NonResumableChangeStreamError']) }
 
@@ -175,7 +175,7 @@ describe Mongo::Error::OperationFailure do
     context 'when there is another label' do
       context 'getMore response' do
         let(:error) { Mongo::Error::OperationFailure.new('no message',
-          Mongo::Operation::GetMore::Result.new([]),
+          Mongo::Operation::GetMore::Result.new(nil),
           :code => 91, :code_name => 'ShutdownInProgress',
           :labels => %w(TransientTransactionError)) }
 

data/spec/mongo/operation/aggregate_spec.rb

@@ -64,7 +64,7 @@ describe Mongo::Operation::Aggregate do
 
       it 'raises an exception' do
         expect {
-          op.execute(authorized_primary)
+          op.execute(authorized_primary, client: nil)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end

data/spec/mongo/operation/collections_info_spec.rb

@@ -31,7 +31,7 @@ describe Mongo::Operation::CollectionsInfo do
     end
 
     let(:info) do
-      docs = op.execute(authorized_primary).documents
+      docs = op.execute(authorized_primary, client: nil).documents
       docs.collect { |info| info['name'].sub("#{SpecConfig.instance.test_db}.", '') }
     end
 

data/spec/mongo/operation/command_spec.rb

@@ -43,7 +43,7 @@ describe Mongo::Operation::Command do
     context 'when the command succeeds' do
 
       let(:response) do
-        op.execute(authorized_primary)
+        op.execute(authorized_primary, client: nil)
       end
 
       it 'returns the reponse' do
@@ -59,7 +59,7 @@ describe Mongo::Operation::Command do
 
       it 'raises an exception' do
         expect {
-          op.execute(authorized_primary)
+          op.execute(authorized_primary, client: nil)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end
@@ -72,7 +72,7 @@ describe Mongo::Operation::Command 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

data/spec/mongo/operation/create_index_spec.rb

@@ -20,7 +20,7 @@ describe Mongo::Operation::CreateIndex do
       end
 
       let(:response) do
-        operation.execute(authorized_primary)
+        operation.execute(authorized_primary, client: nil)
       end
 
       it 'returns ok' do
@@ -43,12 +43,12 @@ describe Mongo::Operation::CreateIndex do
       end
 
       before do
-        operation.execute(authorized_primary)
+        operation.execute(authorized_primary, client: nil)
       end
 
       it 'raises an exception' do
         expect {
-          second_operation.execute(authorized_primary)
+          second_operation.execute(authorized_primary, client: nil)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end

data/spec/mongo/operation/create_user_spec.rb

@@ -26,7 +26,7 @@ describe Mongo::Operation::CreateUser do
     context 'when user creation was successful' do
 
       let!(:response) do
-        operation.execute(root_authorized_primary)
+        operation.execute(root_authorized_primary, client: nil)
       end
 
       it 'saves the user in the database' do
@@ -38,8 +38,8 @@ describe Mongo::Operation::CreateUser do
 
       it 'raises an exception' do
         expect {
-          operation.execute(root_authorized_primary)
-          operation.execute(root_authorized_primary)
+          operation.execute(root_authorized_primary, client: nil)
+          operation.execute(root_authorized_primary, client: nil)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end

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

@@ -99,7 +99,7 @@ describe Mongo::Operation::Delete do
         end
 
         it 'deletes the document from the database' do
-          op.bulk_execute(authorized_primary)
+          op.bulk_execute(authorized_primary, client: nil)
           expect(authorized_collection.find.count).to eq(1)
         end
       end
@@ -122,7 +122,7 @@ describe Mongo::Operation::Delete do
         end
 
         it 'deletes the documents from the database' do
-          op.bulk_execute(authorized_primary)
+          op.bulk_execute(authorized_primary, client: nil)
           expect(authorized_collection.find.count).to eq(0)
         end
       end
@@ -157,7 +157,7 @@ describe Mongo::Operation::Delete do
           end
 
           it 'aborts after first error' do
-            failing_delete.bulk_execute(authorized_primary)
+            failing_delete.bulk_execute(authorized_primary, client: nil)
             expect(authorized_collection.find.count).to eq(2)
           end
         end
@@ -169,7 +169,7 @@ describe Mongo::Operation::Delete do
           end
 
           it 'aborts after first error' do
-            failing_delete.bulk_execute(authorized_primary)
+            failing_delete.bulk_execute(authorized_primary, client: nil)
             expect(authorized_collection.find.count).to eq(2)
           end
         end
@@ -205,7 +205,7 @@ describe Mongo::Operation::Delete do
           end
 
           it 'does not abort after first error' do
-            failing_delete.bulk_execute(authorized_primary)
+            failing_delete.bulk_execute(authorized_primary, client: nil)
             expect(authorized_collection.find.count).to eq(1)
           end
         end
@@ -217,7 +217,7 @@ describe Mongo::Operation::Delete do
           end
 
           it 'does not abort after first error' do
-            failing_delete.bulk_execute(authorized_primary)
+            failing_delete.bulk_execute(authorized_primary, client: nil)
             expect(authorized_collection.find.count).to eq(1)
           end
         end

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

@@ -101,12 +101,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

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

@@ -71,6 +71,7 @@ describe Mongo::Operation::Find::Legacy do
       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 }
         end
@@ -96,7 +97,7 @@ 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)
+        expect(op.execute(authorized_primary, client: nil)).to be_a(Mongo::Operation::Find::Legacy::Result)
       end
     end
   end

data/spec/mongo/operation/get_more_spec.rb

@@ -47,7 +47,7 @@ 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; op.execute(authorized_primary, client: nil); 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,7 @@ describe Mongo::Operation::Insert do
       end
 
       let(:inserted_ids) do
-        op.bulk_execute(authorized_primary).inserted_ids
+        op.bulk_execute(authorized_primary, client: nil).inserted_ids
       end
 
       let(:collection_ids) do
@@ -128,7 +128,7 @@ describe Mongo::Operation::Insert do
       context 'when the insert succeeds' do
 
         let(:response) do
-          op.bulk_execute(authorized_primary)
+          op.bulk_execute(authorized_primary, client: nil)
         end
 
         it 'inserts the documents into the database' do
@@ -146,7 +146,7 @@ describe Mongo::Operation::Insert do
         end
 
         let(:response) do
-          op.bulk_execute(authorized_primary)
+          op.bulk_execute(authorized_primary, client: nil)
         end
 
         it 'inserts the documents into the database' do
@@ -183,7 +183,7 @@ describe Mongo::Operation::Insert do
         context 'when the insert fails' do
 
           it 'aborts after first error' do
-            failing_insert.bulk_execute(authorized_primary)
+            failing_insert.bulk_execute(authorized_primary, client: nil)
             expect(authorized_collection.find.count).to eq(1)
           end
         end
@@ -197,7 +197,7 @@ describe Mongo::Operation::Insert do
         context 'when the insert fails' do
 
           it 'aborts after first error' do
-            failing_insert.bulk_execute(authorized_primary)
+            failing_insert.bulk_execute(authorized_primary, client: nil)
             expect(authorized_collection.find.count).to eq(1)
           end
         end
@@ -228,7 +228,7 @@ 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)
+            failing_insert.bulk_execute(authorized_primary, client: nil)
             expect(authorized_collection.find.count).to eq(2)
           end
         end
@@ -243,7 +243,7 @@ describe Mongo::Operation::Insert do
         context 'when the insert fails' do
 
           it 'does not after first error' do
-            failing_insert.bulk_execute(authorized_primary)
+            failing_insert.bulk_execute(authorized_primary, client: nil)
             expect(authorized_collection.find.count).to eq(2)
           end
         end