mongo 2.15.1 → 2.16.0.alpha1

data/spec/mongo/collection_crud_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 
 describe Mongo::Collection do
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|
@@ -1894,6 +1894,11 @@ describe Mongo::Collection do
     context 'when a session supporting causal consistency is used' do
       require_wired_tiger
 
+      before do
+        collection.drop
+        collection.create
+      end
+
       let(:cursors) do
         collection.parallel_scan(2, session: session)
       end
@@ -4352,7 +4357,7 @@ describe Mongo::Collection do
         expect(command[:writeConcern]).to_not be_nil
         expect(command[:writeConcern][:w]).to eq(1)
         expect(command[:upsert]).to be(true)
-        expect(command[:bypassDocumentValidation]).to be_nil
+        expect(command[:bypassDocumentValidation]).to be false
         expect(command[:maxTimeMS]).to eq(200)
       end
     end

data/spec/mongo/collection_ddl_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 
 describe Mongo::Collection do
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|

data/spec/mongo/collection_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 
 describe Mongo::Collection do
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|

data/spec/mongo/cursor/builder/get_more_command_spec.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
+# TODO convert, move or delete these tests as part of RUBY-2706.
+
+=begin
 require 'spec_helper'
 
 describe Mongo::Cursor::Builder::GetMoreCommand do
@@ -189,3 +192,4 @@ describe Mongo::Cursor::Builder::GetMoreCommand do
     end
   end
 end
+=end

data/spec/mongo/cursor/builder/op_get_more_spec.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
+# TODO convert, move or delete these tests as part of RUBY-2706.
+
+=begin
 require 'spec_helper'
 
 describe Mongo::Cursor::Builder::OpGetMore do
@@ -62,3 +65,4 @@ describe Mongo::Cursor::Builder::OpGetMore do
     end
   end
 end
+=end

data/spec/mongo/cursor_spec.rb

@@ -80,6 +80,8 @@ describe Mongo::Cursor do
     end
 
     context 'server is unknown' do
+      require_topology :single, :replica_set, :sharded
+
       let(:server) do
         view.send(:server_selector).select_server(authorized_client.cluster).tap do |server|
           authorized_client.cluster.disconnect!
@@ -329,8 +331,7 @@ describe Mongo::Cursor do
 
       before do
         authorized_collection.insert_many(documents)
-        cluster.schedule_kill_cursor(cursor.id,
-                                     cursor.send(:kill_cursors_op_spec),
+        cluster.schedule_kill_cursor(cursor.kill_spec,
                                      cursor.instance_variable_get(:@server))
       end
 
@@ -429,7 +430,7 @@ describe Mongo::Cursor do
 
       it 'removes the cursor id from the active cursors tracked by the cluster cursor manager' do
         enum.next
-        expect(cursor_reaper.instance_variable_get(:@active_cursors)).not_to include(cursor_id)
+        expect(cursor_reaper.instance_variable_get(:@active_cursor_ids)).not_to include(cursor_id)
       end
     end
   end
@@ -437,7 +438,7 @@ describe Mongo::Cursor do
   context 'when an implicit session is used' do
     min_server_fcv '3.6'
 
-    let(:subscriber) { EventSubscriber.new }
+    let(:subscriber) { Mrss::EventSubscriber.new }
 
     let(:subscribed_client) do
       authorized_client.tap do |client|
@@ -555,8 +556,17 @@ describe Mongo::Cursor do
         db_name: SpecConfig.instance.test_db, coll_name: TEST_COLL }
     end
 
+    let(:conn_desc) do
+      double('connection description').tap do |cd|
+        allow(cd).to receive(:service_id).and_return(nil)
+      end
+    end
+
     let(:reply) do
-      Mongo::Operation::Find.new(query_spec).tap do |reply|
+      double('reply').tap do |reply|
+        allow(reply).to receive(:is_a?).with(Mongo::Operation::Result).and_return(true)
+        allow(reply).to receive(:namespace)
+        allow(reply).to receive(:connection_description).and_return(conn_desc)
         allow(reply).to receive(:cursor_id).and_return(42)
       end
     end

data/spec/mongo/database_spec.rb

@@ -218,7 +218,7 @@ describe Mongo::Database do
           described_class.new(client, SpecConfig.instance.test_db)
         end
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           authorized_client.tap do |client|
@@ -391,7 +391,7 @@ describe Mongo::Database do
           described_class.new(client, SpecConfig.instance.test_db)
         end
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           authorized_client.tap do |client|
@@ -583,7 +583,7 @@ describe Mongo::Database do
           described_class.new(client, SpecConfig.instance.test_db)
         end
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           authorized_client.tap do |client|
@@ -678,7 +678,7 @@ describe Mongo::Database do
         client.start_session
       end
 
-      let(:subscriber) { EventSubscriber.new }
+      let(:subscriber) { Mrss::EventSubscriber.new }
 
       let(:client) do
         authorized_client.tap do |client|
@@ -732,12 +732,12 @@ describe Mongo::Database do
         database.cluster.next_primary
       end
 
-      before do
-        expect(primary_server).to receive(:with_connection).at_least(:once).and_call_original
-      end
-
       it 'uses read preference of primary' do
-        expect(database.command(ping: 1)).to be_successful
+        RSpec::Mocks.with_temporary_scope do
+          expect(primary_server).to receive(:with_connection).with(any_args).and_call_original
+
+          expect(database.command(ping: 1)).to be_successful
+        end
       end
     end
 
@@ -760,12 +760,12 @@ describe Mongo::Database do
         described_class.new(client, SpecConfig.instance.test_db, client.options)
       end
 
-      before do
-        expect(primary_server).to receive(:with_connection).at_least(:once).and_call_original
-      end
-
       it 'does not use the client read preference 'do
-        expect(database.command(ping: 1)).to be_successful
+        RSpec::Mocks.with_temporary_scope do
+          expect(primary_server).to receive(:with_connection).with(any_args).and_call_original
+
+          expect(database.command(ping: 1)).to be_successful
+        end
       end
     end
 
@@ -969,7 +969,7 @@ describe Mongo::Database do
           client.start_session
         end
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           root_authorized_client.tap do |client|

data/spec/mongo/error/operation_failure_heavy_spec.rb

@@ -9,7 +9,7 @@ describe Mongo::Error::OperationFailure do
     # Fail point will work on 4.0 mongod but requires 4.2 for mongos
     min_server_fcv '4.2'
     # Fail point must be set on the same server to which the query is sent
-    require_no_multi_shard
+    require_no_multi_mongos
 
     # https://github.com/mongodb/specifications/commit/7745234f93039a83ae42589a6c0cdbefcffa32fa
     let(:fail_point_command) do

data/spec/mongo/grid/fs_bucket_spec.rb

@@ -362,7 +362,7 @@ describe Mongo::Grid::FSBucket do
         fs.database[fs.files_collection.name].indexes
       end
 
-      before do
+      let(:operation) do
         expect(fs.files_collection).to receive(:indexes).and_call_original
         expect(fs.chunks_collection).to receive(:indexes).and_call_original
         fs.insert_one(file)
@@ -376,26 +376,36 @@ describe Mongo::Grid::FSBucket do
         fs.database[fs.files_collection.name].indexes.get(:filename => 1, :uploadDate => 1)
       end
 
+      it 'tries to create indexes' do
+        expect(fs).to receive(:create_index_if_missing!).twice.and_call_original
+        operation
+      end
+
       it 'creates an index on the files collection' do
+        operation
         expect(files_index[:name]).to eq('filename_1_uploadDate_1')
       end
 
       it 'creates an index on the chunks collection' do
+        operation
         expect(chunks_index[:name]).to eq('files_id_1_n_1')
       end
 
       context 'when a write operation is called more than once' do
 
-        before do
-          expect(fs).not_to receive(:ensure_indexes!)
-        end
-
         let(:file2) do
           Mongo::Grid::File.new('Goodbye!', :filename => 'test2.txt')
         end
 
         it 'only creates the indexes the first time' do
-          expect(fs.insert_one(file2)).to be_a(BSON::ObjectId)
+          RSpec::Mocks.with_temporary_scope do
+            expect(fs).to receive(:create_index_if_missing!).twice.and_call_original
+            operation
+          end
+          RSpec::Mocks.with_temporary_scope do
+            expect(fs).not_to receive(:create_index_if_missing!)
+            expect(fs.insert_one(file2)).to be_a(BSON::ObjectId)
+          end
         end
       end
     end
@@ -404,14 +414,12 @@ describe Mongo::Grid::FSBucket do
 
       before do
         fs.chunks_collection.indexes.create_one(Mongo::Grid::FSBucket::CHUNKS_INDEX, :unique => false)
-        expect(fs.chunks_collection).to receive(:indexes).and_call_original
-        expect(fs.files_collection).not_to receive(:indexes)
       end
 
-      it 'raises the error to the user' do
+      it 'should not raise an error to the user' do
         expect {
           fs.insert_one(file)
-        }.to raise_error(Mongo::Error::OperationFailure)
+        }.not_to raise_error
       end
     end
 
@@ -419,8 +427,6 @@ describe Mongo::Grid::FSBucket do
 
       before do
         support_fs.insert_one(support_file)
-        expect(fs.files_collection).not_to receive(:indexes)
-        expect(fs.chunks_collection).not_to receive(:indexes)
         fs.insert_one(file)
       end
 

data/spec/mongo/grid/stream/write_spec.rb

@@ -259,8 +259,6 @@ describe Mongo::Grid::FSBucket::Stream::Write do
       context 'when the files collection is empty' do
 
         before do
-          expect(fs.files_collection).to receive(:indexes).and_call_original
-          expect(fs.chunks_collection).to receive(:indexes).and_call_original
           stream.write(file)
         end
 
@@ -329,8 +327,6 @@ describe Mongo::Grid::FSBucket::Stream::Write do
         before do
           support_fs.send(:ensure_indexes!)
           support_fs.files_collection.insert_one(a: 1)
-          expect(fs.files_collection).not_to receive(:indexes)
-          expect(fs.chunks_collection).not_to receive(:indexes)
           stream.write(file)
         end
 
@@ -343,18 +339,16 @@ describe Mongo::Grid::FSBucket::Stream::Write do
         end
       end
 
-      context 'when the index creation encounters an error' do
+      context 'when the index creation is done explicitely' do
 
         before do
           fs.chunks_collection.indexes.create_one(Mongo::Grid::FSBucket::CHUNKS_INDEX, :unique => false)
-          expect(fs.chunks_collection).to receive(:indexes).and_call_original
-          expect(fs.files_collection).not_to receive(:indexes)
         end
 
-        it 'raises the error to the user' do
+        it 'should not raise an error to the user' do
           expect {
             stream.write(file)
-          }.to raise_error(Mongo::Error::OperationFailure)
+          }.not_to raise_error
         end
       end
     end

data/spec/mongo/grid/stream_spec.rb

@@ -48,4 +48,4 @@ describe Mongo::Grid::FSBucket::Stream do
       end
     end
   end
-end
+end

data/spec/mongo/index/view_spec.rb

@@ -266,7 +266,7 @@ describe Mongo::Index::View do
           context 'on server versions >= 4.4' do
             min_server_fcv '4.4'
 
-            let(:subscriber) { EventSubscriber.new }
+            let(:subscriber) { Mrss::EventSubscriber.new }
 
             let(:client) do
               authorized_client.tap do |client|
@@ -932,7 +932,7 @@ describe Mongo::Index::View do
       context 'on server versions >= 4.4' do
         min_server_fcv '4.4'
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           authorized_client.tap do |client|

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

@@ -95,7 +95,7 @@ describe Mongo::Operation::Delete::OpMsg do
     context 'when write concern is specified' do
 
       it 'includes write concern in the selector' do
-        expect(op.send(:command, connection)[:writeConcern]).to eq(write_concern.options)
+        expect(op.send(:command, connection)[:writeConcern]).to eq(BSON::Document.new(write_concern.options))
       end
     end
   end

data/spec/mongo/{collection/view → operation/find}/builder/flags_spec.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
-require 'spec_helper'
+require 'lite_spec_helper'
 
-describe Mongo::Collection::View::Builder::Flags do
+describe Mongo::Operation::Find::Builder::Flags do
 
   describe '.map_flags' do
 

data/spec/mongo/{collection/view → operation/find}/builder/modifiers_spec.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
-require 'spec_helper'
+require 'lite_spec_helper'
 
-describe Mongo::Collection::View::Builder::Modifiers do
+describe Mongo::Operation::Find::Builder::Modifiers do
 
   describe '.map_driver_options' do
 

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

@@ -78,6 +78,7 @@ describe Mongo::Operation::Find::Legacy do
         double('description').tap do |description|
           expect(description).to receive(:mongos?) { false }
           expect(description).to receive(:standalone?) { false }
+          #expect(description).to receive(:load_balancer?) { false }
         end
       end
 

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

@@ -4,7 +4,7 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Insert do
-  require_no_multi_shard
+  require_no_multi_mongos
   require_no_required_api_version
 
   let(:context) { Mongo::Operation::Context.new }

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

@@ -95,7 +95,7 @@ describe Mongo::Operation::Insert::OpMsg do
     context 'when write concern is specified' do
 
       it 'includes write concern in the selector' do
-        expect(op.send(:command, connection)[:writeConcern]).to eq(write_concern.options)
+        expect(op.send(:command, connection)[:writeConcern]).to eq(BSON::Document.new(write_concern.options))
       end
     end
   end

data/spec/mongo/operation/kill_cursors_spec.rb

@@ -35,9 +35,12 @@ describe Mongo::Operation::KillCursors::Legacy do
   end
 
   describe '#message' do
+    let(:expected_cursor_ids) do
+      spec[:cursor_ids].map { |v| BSON::Int64.new(v) }
+    end
 
     it 'creates a kill cursors wire protocol message with correct specs' do
-      expect(Mongo::Protocol::KillCursors).to receive(:new).with(TEST_COLL, SpecConfig.instance.test_db, spec[:cursor_ids])
+      expect(Mongo::Protocol::KillCursors).to receive(:new).with(TEST_COLL, SpecConfig.instance.test_db, expected_cursor_ids)
       op.send(:message, double('server'))
     end
   end

data/spec/mongo/operation/read_preference_legacy_spec.rb

@@ -33,12 +33,16 @@ describe Mongo::Operation::ReadPreferenceSupported do
     double('description').tap do |description|
       allow(description).to receive(:mongos?).and_return(mongos?)
       allow(description).to receive(:standalone?).and_return(standalone?)
+      # TODO consider adding tests for load-balanced topologies also
+      allow(description).to receive(:load_balancer?).and_return(false)
     end
   end
 
   let(:server) do
     double('server').tap do |server|
       allow(server).to receive(:cluster).and_return(cluster)
+      # TODO consider adding tests for load-balanced topologies also
+      allow(server).to receive(:load_balancer?).and_return(false)
     end
   end
 

data/spec/mongo/operation/read_preference_op_msg_spec.rb

@@ -41,6 +41,8 @@ describe Mongo::Operation::SessionsSupported do
   let(:server) do
     double('server').tap do |server|
       allow(server).to receive(:cluster).and_return(cluster)
+      # TODO consider adding tests for load-balanced topologies also
+      allow(server).to receive(:load_balancer?).and_return(false)
     end
   end
 

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

@@ -4,7 +4,7 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Update do
-  require_no_multi_shard
+  require_no_multi_mongos
   require_no_required_api_version
 
   let(:context) { Mongo::Operation::Context.new }

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

@@ -101,7 +101,7 @@ describe Mongo::Operation::Update::OpMsg do
     context 'when write concern is specified' do
 
       it 'includes write concern in the selector' do
-        expect(op.send(:command, connection)[:writeConcern]).to eq(write_concern.options)
+        expect(op.send(:command, connection)[:writeConcern]).to eq(BSON::Document.new(write_concern.options))
       end
     end
   end

data/spec/mongo/query_cache_spec.rb

@@ -14,7 +14,7 @@ describe Mongo::QueryCache do
     authorized_collection.delete_many
   end
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|
@@ -139,7 +139,11 @@ describe Mongo::QueryCache do
 
   describe '#get' do
     let(:view) { double("Mongo::Collection::View") }
-    let(:result) { double("Mongo::Operation::Result") }
+    let(:result) do
+      double("Mongo::Operation::Result").tap do |result|
+        allow(result).to receive(:is_a?).with(Mongo::Operation::Result).and_return(true)
+      end
+    end
     let(:server) { double("Mongo::Server") }
     let(:caching_cursor) { Mongo::CachingCursor.new(view, result, server) }
 

data/spec/mongo/server/connection_common_spec.rb

@@ -1,24 +1,75 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
-require 'spec_helper'
+require 'lite_spec_helper'
 
 describe Mongo::Server::ConnectionCommon do
   let(:subject) { described_class.new }
 
+  let(:metadata) do
+    Mongo::Server::AppMetadata.new({})
+  end
+
   describe '#handshake_document' do
-    it 'returns hello document with API version' do
-      meta = Mongo::Server::AppMetadata.new({
-        server_api: { version: '1'  }
-      })
-      document = subject.handshake_document(meta)
-      expect(document['hello']).to eq(1)
+    let(:document) do
+      subject.handshake_document(metadata)
+    end
+
+    context 'with api version' do
+      let(:metadata) do
+        Mongo::Server::AppMetadata.new({
+          server_api: { version: '1'  }
+        })
+      end
+
+      it 'returns hello document with API version' do
+        expect(document['hello']).to eq(1)
+      end
+    end
+
+    context 'without api version' do
+      it 'returns legacy hello document without API version' do
+        expect(document['isMaster']).to eq(1)
+      end
+    end
+
+    context 'when connecting to load balancer' do
+
+      let(:document) do
+        subject.handshake_document(metadata, load_balancer: true)
+      end
+
+      it 'includes loadBalanced: true' do
+        document['loadBalanced'].should be true
+      end
+    end
+  end
+
+  describe '#handshake_command' do
+    let(:document) do
+      subject.handshake_document(metadata)
+    end
+
+    context 'with api version' do
+      let(:metadata) do
+        Mongo::Server::AppMetadata.new({
+          server_api: { version: '1'  }
+        })
+      end
+
+      it 'returns OP_MSG command' do
+        expect(
+          subject.handshake_command(document)
+        ).to be_a(Mongo::Protocol::Msg)
+      end
     end
 
-    it 'returns legacy hello document without API version' do
-      meta = Mongo::Server::AppMetadata.new({})
-      document = subject.handshake_document(meta)
-      expect(document['isMaster']).to eq(1)
+    context 'without api version' do
+      it 'returns OP_QUERY command' do
+        expect(
+          subject.handshake_command(document)
+        ).to be_a(Mongo::Protocol::Query)
+      end
     end
   end
 end