mongo 2.14.1 → 2.15.0.alpha

data/spec/mongo/database_spec.rb

@@ -95,6 +95,26 @@ describe Mongo::Database do
         expect(collection.server_selector).to eq(Mongo::ServerSelector.get(mode: :secondary))
         expect(collection.read_preference).to eq(BSON::Document.new(mode: :secondary))
       end
+
+      context ':server_api option' do
+
+        let(:client) do
+          new_local_client_nmio(['localhost'], server_api: {version: '1'})
+        end
+
+        it 'is not transfered to the collection' do
+          client.options[:server_api].should == {'version' => '1'}
+          collection.options[:server_api].should be nil
+        end
+      end
+    end
+
+    context 'when providing :server_api option' do
+      it 'is rejected' do
+        lambda do
+          database['foo', server_api: {version: '1'}]
+        end.should raise_error(ArgumentError, 'The :server_api option cannot be specified for collection objects. It can only be specified on Client level')
+      end
     end
   end
 
@@ -319,21 +339,40 @@ describe Mongo::Database do
         described_class.new(root_authorized_client, 'admin')
       end
 
-      it 'does not include system collections' do
-        expect(result.none? { |name| name =~ /(^|\.)system\./ }).to be true
+      shared_examples 'does not include system collections' do
+        it 'does not include system collections' do
+          expect(result.none? { |name| name =~ /(^|\.)system\./ }).to be true
+        end
       end
 
-      context 'server 3.0+' do
+      context 'server 4.7+' do
+        min_server_fcv '4.7'
+        # https://jira.mongodb.org/browse/SERVER-35804
+        require_topology :single, :replica_set
+
+        include_examples 'does not include system collections'
+
+        it 'returns results' do
+          expect(result).to include('acol')
+        end
+      end
+
+      context 'server 3.0-4.5' do
         min_server_fcv '3.0'
+        max_server_version '4.5'
+
+        include_examples 'does not include system collections'
 
         it 'returns results' do
           expect(result).to include('acol')
         end
       end
 
-      context 'server 2.6-' do
+      context 'server 2.6' do
         max_server_version '2.6'
 
+        include_examples 'does not include system collections'
+
         it 'returns results' do
           expect(result).to include('admin.acol')
         end
@@ -836,6 +875,29 @@ describe Mongo::Database do
         end
       end
     end
+
+    context 'when client server api is not set' do
+      require_no_required_api_version
+      min_server_fcv '4.7'
+
+      it 'passes server api parameters' do
+        lambda do
+          database.command(ping: 1, apiVersion: 'does-not-exist')
+        end.should raise_error(
+          an_instance_of(Mongo::Error::OperationFailure).and having_attributes(code: 322))
+      end
+    end
+
+    context 'when client server api is set' do
+      require_required_api_version
+      min_server_fcv '4.7'
+
+      it 'reports server api conflict' do
+        lambda do
+          database.command(ping: 1, apiVersion: 'does-not-exist')
+        end.should raise_error(Mongo::Error::ServerApiConflict)
+      end
+    end
   end
 
   describe '#drop' do

data/spec/mongo/error/bulk_write_error_spec.rb

@@ -31,19 +31,19 @@ describe Mongo::Error::BulkWriteError do
 
   describe '#message' do
     it 'is correct' do
-      expect(error.message).to eq("message1 (1), message2 (2) (note1, note2)")
+      expect(error.message).to eq("Multiple errors: [1]: message1; [2]: message2 (note1, note2)")
     end
   end
 
   describe '#to_s' do
     it 'is correct' do
-      expect(error.to_s).to eq("message1 (1), message2 (2) (note1, note2)")
+      expect(error.to_s).to eq("Multiple errors: [1]: message1; [2]: message2 (note1, note2)")
     end
   end
 
   describe '#inspect' do
     it 'is correct' do
-      expect(error.inspect).to eq("#<Mongo::Error::BulkWriteError: message1 (1), message2 (2) (note1, note2)>")
+      expect(error.inspect).to eq("#<Mongo::Error::BulkWriteError: Multiple errors: [1]: message1; [2]: message2 (note1, note2)>")
     end
   end
 end

data/spec/mongo/error/parser_spec.rb

@@ -25,10 +25,22 @@ describe Mongo::Error::Parser do
       end
 
       it 'returns the message' do
-        expect(parser.message).to eq('no such command: notacommand (59)')
+        expect(parser.message).to eq('[59]: no such command: notacommand')
       end
     end
 
+    context 'when the document contains an errmsg and code name' do
+
+      let(:document) do
+        { 'errmsg' => 'no such command: notacommand', 'code' => 59, 'codeName' => 'foo' }
+      end
+
+      it 'returns the message' do
+        expect(parser.message).to eq('[59:foo]: no such command: notacommand')
+      end
+    end
+
+=begin
     context 'when the document contains writeErrors' do
 
       context 'when only a single error exists' do
@@ -38,7 +50,7 @@ describe Mongo::Error::Parser do
         end
 
         it 'returns the message' do
-          expect(parser.message).to eq('Unknown modifier: $st (9)')
+          expect(parser.message).to eq('[9]: Unknown modifier: $st')
         end
       end
 
@@ -55,11 +67,30 @@ describe Mongo::Error::Parser do
 
         it 'returns the messages concatenated' do
           expect(parser.message).to eq(
-            'Unknown modifier: $st (9), Unknown modifier: $bl (9)'
+            'Multiple errors: 9: Unknown modifier: $st; 9: Unknown modifier: $bl'
+          )
+        end
+      end
+
+      context 'when multiple errors with code names exist' do
+
+        let(:document) do
+          {
+            'writeErrors' => [
+              { 'code' => 9, 'codeName' => 'foo', 'errmsg' => 'Unknown modifier: $st' },
+              { 'code' => 9, 'codeName' => 'foo', 'errmsg' => 'Unknown modifier: $bl' },
+            ]
+          }
+        end
+
+        it 'returns the messages concatenated' do
+          expect(parser.message).to eq(
+            'Multiple errors: [9:foo]: Unknown modifier: $st; [9:foo]: Unknown modifier: $bl'
           )
         end
       end
     end
+=end
 
     context 'when the document contains $err' do
 
@@ -68,7 +99,7 @@ describe Mongo::Error::Parser do
       end
 
       it 'returns the message' do
-        expect(parser.message).to eq('not authorized for query (13)')
+        expect(parser.message).to eq('[13]: not authorized for query')
       end
     end
 
@@ -79,7 +110,7 @@ describe Mongo::Error::Parser do
       end
 
       it 'returns the message' do
-        expect(parser.message).to eq('not authorized for query (13)')
+        expect(parser.message).to eq('[13]: not authorized for query')
       end
     end
 
@@ -90,7 +121,7 @@ describe Mongo::Error::Parser do
       end
 
       it 'returns the message' do
-        expect(parser.message).to eq('Not enough data-bearing nodes (100)')
+        expect(parser.message).to eq('[100]: Not enough data-bearing nodes')
       end
     end
   end

data/spec/mongo/index/view_spec.rb

@@ -650,6 +650,8 @@ describe Mongo::Index::View do
     end
 
     context 'when using bucket option' do
+      # Option is removed in 4.9
+      max_server_version '4.7'
 
       let(:spec) do
         { 'any' => 1 }
@@ -756,6 +758,8 @@ describe Mongo::Index::View do
       end
 
       context 'when using bucket option' do
+        # Option is removed in 4.9
+        max_server_version '4.7'
 
         let(:spec) do
           { 'any' => 1 }

data/spec/mongo/monitoring/event/server_heartbeat_failed_spec.rb

@@ -20,7 +20,7 @@ describe Mongo::Monitoring::Event::ServerHeartbeatFailed do
   end
 
   let(:event) do
-    described_class.new(address, 1, Mongo::Error::SocketError.new('foo'))
+    described_class.new(address, 1, Mongo::Error::SocketError.new('foo'), started_event: nil)
   end
 
   describe '#summary' do

data/spec/mongo/monitoring/event/server_heartbeat_succeeded_spec.rb

@@ -20,7 +20,7 @@ describe Mongo::Monitoring::Event::ServerHeartbeatSucceeded do
   end
 
   let(:event) do
-    described_class.new(address, 1)
+    described_class.new(address, 1, started_event: nil)
   end
 
   describe '#summary' do

data/spec/mongo/operation/aggregate_spec.rb

@@ -19,6 +19,7 @@ describe Mongo::Operation::Aggregate do
   end
   let(:op) { described_class.new(spec) }
 
+  let(:context) { Mongo::Operation::Context.new }
 
   describe '#initialize' do
 
@@ -64,7 +65,7 @@ describe Mongo::Operation::Aggregate do
 
       it 'raises an exception' do
         expect {
-          op.execute(authorized_primary, client: nil)
+          op.execute(authorized_primary, context: context)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end

data/spec/mongo/operation/collections_info_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mongo::Operation::CollectionsInfo do
+  require_no_required_api_version
 
   let(:spec) do
     { selector: { listCollections: 1 },
@@ -16,6 +17,8 @@ describe Mongo::Operation::CollectionsInfo do
     described_class.new(spec)
   end
 
+  let(:context) { Mongo::Operation::Context.new }
+
   describe '#execute' do
 
     before do
@@ -31,7 +34,7 @@ describe Mongo::Operation::CollectionsInfo do
     end
 
     let(:info) do
-      docs = op.execute(authorized_primary, client: nil).documents
+      docs = op.execute(authorized_primary, context: context).documents
       docs.collect { |info| info['name'].sub("#{SpecConfig.instance.test_db}.", '') }
     end
 

data/spec/mongo/operation/command_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Command do
+  require_no_required_api_version
 
   let(:selector) { { :ismaster => 1 } }
   let(:options) { { :limit => -1 } }
@@ -12,6 +13,8 @@ describe Mongo::Operation::Command do
   end
   let(:op) { described_class.new(spec) }
 
+  let(:context) { Mongo::Operation::Context.new }
+
   describe '#initialize' do
 
     it 'sets the spec' do
@@ -43,7 +46,7 @@ describe Mongo::Operation::Command do
     context 'when the command succeeds' do
 
       let(:response) do
-        op.execute(authorized_primary, client: nil)
+        op.execute(authorized_primary, context: context)
       end
 
       it 'returns the reponse' do
@@ -59,7 +62,7 @@ describe Mongo::Operation::Command do
 
       it 'raises an exception' do
         expect {
-          op.execute(authorized_primary, client: nil)
+          op.execute(authorized_primary, context: context)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end
@@ -72,7 +75,7 @@ describe Mongo::Operation::Command do
 
       it 'raises an error' do
         expect {
-          op.execute(authorized_primary, client: nil)
+          op.execute(authorized_primary, context: context)
         }.to raise_error(Mongo::Error::MaxBSONSize)
       end
     end

data/spec/mongo/operation/create_index_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mongo::Operation::CreateIndex do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   before do
     authorized_collection.drop
@@ -20,7 +23,7 @@ describe Mongo::Operation::CreateIndex do
       end
 
       let(:response) do
-        operation.execute(authorized_primary, client: nil)
+        operation.execute(authorized_primary, context: context)
       end
 
       it 'returns ok' do
@@ -43,12 +46,12 @@ describe Mongo::Operation::CreateIndex do
       end
 
       before do
-        operation.execute(authorized_primary, client: nil)
+        operation.execute(authorized_primary, context: context)
       end
 
       it 'raises an exception' do
         expect {
-          second_operation.execute(authorized_primary, client: nil)
+          second_operation.execute(authorized_primary, context: context)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end

data/spec/mongo/operation/create_user_spec.rb

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

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

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Delete do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   let(:documents) do
     [ { 'q' => { foo: 1 }, 'limit' => 1 } ]
@@ -100,7 +103,7 @@ describe Mongo::Operation::Delete do
 
         it 'deletes the document from the database' do
           authorized_primary.with_connection do |connection|
-            op.bulk_execute(connection, client: nil)
+            op.bulk_execute(connection, context: context)
           end
           expect(authorized_collection.find.count).to eq(1)
         end
@@ -125,7 +128,7 @@ describe Mongo::Operation::Delete do
 
         it 'deletes the documents from the database' do
           authorized_primary.with_connection do |connection|
-            op.bulk_execute(connection, client: nil)
+            op.bulk_execute(connection, context: context)
           end
           expect(authorized_collection.find.count).to eq(0)
         end
@@ -162,7 +165,7 @@ describe Mongo::Operation::Delete do
 
           it 'aborts after first error' do
             authorized_primary.with_connection do |connection|
-              failing_delete.bulk_execute(connection, client: nil)
+              failing_delete.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find.count).to eq(2)
           end
@@ -176,7 +179,7 @@ describe Mongo::Operation::Delete do
 
           it 'aborts after first error' do
             authorized_primary.with_connection do |connection|
-              failing_delete.bulk_execute(connection, client: nil)
+              failing_delete.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find.count).to eq(2)
           end
@@ -214,7 +217,7 @@ describe Mongo::Operation::Delete do
 
           it 'does not abort after first error' do
             authorized_primary.with_connection do |connection|
-              failing_delete.bulk_execute(connection, client: nil)
+              failing_delete.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find.count).to eq(1)
           end
@@ -228,7 +231,7 @@ describe Mongo::Operation::Delete do
 
           it 'does not abort after first error' do
             authorized_primary.with_connection do |connection|
-              failing_delete.bulk_execute(connection, client: nil)
+              failing_delete.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find.count).to eq(1)
           end

data/spec/mongo/operation/delete_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Delete do
+  require_no_required_api_version
+
   before do
     begin
       authorized_collection.delete_many
@@ -30,6 +32,8 @@ describe Mongo::Operation::Delete do
 
   let(:op) { described_class.new(spec) }
 
+  let(:context) { Mongo::Operation::Context.new }
+
   describe '#initialize' do
 
     context 'spec' do
@@ -103,7 +107,7 @@ describe Mongo::Operation::Delete do
         end
 
         let(:result) do
-          delete.execute(authorized_primary, client: nil)
+          delete.execute(authorized_primary, context: context)
         end
 
         it 'deletes the documents from the database' do
@@ -123,7 +127,7 @@ describe Mongo::Operation::Delete do
 
         it 'raises an exception' do
           expect {
-            delete.execute(authorized_primary, client: nil)
+            delete.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
@@ -147,7 +151,7 @@ describe Mongo::Operation::Delete do
         end
 
         let(:result) do
-          delete.execute(authorized_primary, client: nil)
+          delete.execute(authorized_primary, context: context)
         end
 
         it 'deletes the documents from the database' do
@@ -166,13 +170,13 @@ describe Mongo::Operation::Delete do
         end
 
         let(:result) do
-          delete.execute(authorized_primary, client: nil)
+          delete.execute(authorized_primary, context: context)
         end
 
         it 'does not delete any documents' do
 
           expect {
-            op.execute(authorized_primary, client: nil)
+            op.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::OperationFailure)
 
           expect(authorized_collection.find.count).to eq(2)
@@ -187,7 +191,7 @@ describe Mongo::Operation::Delete do
 
         it 'raises an error' do
           expect {
-            op.execute(authorized_primary, client: nil)
+            op.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::MaxBSONSize)
         end
       end
@@ -211,7 +215,7 @@ describe Mongo::Operation::Delete do
       end
 
       let(:result) do
-        delete.execute(authorized_primary, client: nil)
+        delete.execute(authorized_primary, context: context)
       end
 
       before do

data/spec/mongo/operation/drop_index_spec.rb

@@ -1,10 +1,14 @@
 require 'spec_helper'
 
 describe Mongo::Operation::DropIndex do
+  require_no_required_api_version
+
   before do
     authorized_collection.indexes.drop_all
   end
 
+  let(:context) { Mongo::Operation::Context.new }
+
   describe '#execute' do
 
     context 'when the index exists' do
@@ -26,7 +30,7 @@ describe Mongo::Operation::DropIndex do
       end
 
       let(:response) do
-        operation.execute(authorized_primary, client: nil)
+        operation.execute(authorized_primary, context: context)
       end
 
       it 'removes the index' do
@@ -46,7 +50,7 @@ describe Mongo::Operation::DropIndex do
 
       it 'raises an exception' do
         expect {
-          operation.execute(authorized_primary, client: nil)
+          operation.execute(authorized_primary, context: context)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end

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

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe Mongo::Operation::Find::Legacy do
   max_server_version '3.4'
 
+  let(:context) { Mongo::Operation::Context.new }
+
   let(:selector) { { foo: 1 } }
   let(:query_options) { {} }
   let(:spec) do
@@ -116,7 +118,7 @@ describe Mongo::Operation::Find::Legacy do
 
       it 'does not raise an exception' do
         authorized_primary.with_connection do |connection|
-          expect(op.execute(connection, client: nil)).to be_a(Mongo::Operation::Find::Legacy::Result)
+          expect(op.execute(connection, context: context)).to be_a(Mongo::Operation::Find::Legacy::Result)
         end
       end
     end

data/spec/mongo/operation/get_more_spec.rb

@@ -19,6 +19,8 @@ describe Mongo::Operation::GetMore::Legacy do
 
   let(:op) { described_class.new(spec) }
 
+  let(:context) { Mongo::Operation::Context.new }
+
   describe '#initialize' do
 
     it 'sets the spec' do
@@ -49,7 +51,7 @@ describe Mongo::Operation::GetMore::Legacy do
       expect(Mongo::Protocol::GetMore).to receive(:new).with(SpecConfig.instance.test_db, TEST_COLL, to_return, cursor_id).and_call_original
       begin
         authorized_primary.with_connection do |connection|
-          op.execute(connection, client: nil)
+          op.execute(connection, context: context)
         end
       rescue
       end

data/spec/mongo/operation/indexes_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Indexes do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
+
   describe '#execute' do
 
     let(:index_spec) do
@@ -24,7 +28,7 @@ describe Mongo::Operation::Indexes do
     end
 
     let(:indexes) do
-      operation.execute(authorized_primary, client: nil)
+      operation.execute(authorized_primary, context: context)
     end
 
     it 'returns the indexes for the collection' do