mongo 2.15.0 → 2.17.0

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
 
@@ -97,6 +99,29 @@ describe Mongo::Operation::SessionsSupported do
       end
     end
 
+    shared_examples_for 'sends read preference correctly for replica set' do
+      context "when read preference mode is primary" do
+        let(:mode) { :primary}
+
+        it_behaves_like 'does not modify selector'
+      end
+      %i(primary_preferred secondary secondary_preferred nearest).each do |_mode|
+        active_mode = _mode
+
+        context "when read preference mode is #{active_mode}" do
+          let(:mode) { active_mode }
+
+          let(:expected) do
+            selector.merge(:$readPreference => expected_read_preference)
+          end
+
+          it 'adds read preference' do
+            expect(actual).to eq(expected)
+          end
+        end
+      end
+    end
+
     shared_examples_for 'sends user-specified read preference' do
       %i(primary primary_preferred secondary secondary_preferred nearest).each do |_mode|
         active_mode = _mode
@@ -300,7 +325,7 @@ describe Mongo::Operation::SessionsSupported do
         let(:standalone?) { false }
         let(:mongos?) { false }
 
-        it_behaves_like 'sends user-specified read preference'
+        it_behaves_like 'sends read preference correctly for replica set'
       end
     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

data/spec/mongo/server/connection_pool_spec.rb

@@ -317,6 +317,11 @@ describe Mongo::Server::ConnectionPool do
     end
 
     context 'connection of the same generation as pool' do
+      # These tests are also applicable to load balancers, but
+      # require different setup and assertions because load balancers
+      # do not have a single global generation.
+      require_topology :single, :replica_set, :sharded
+
       before do
         expect(pool.generation).to eq(connection.generation)
       end
@@ -349,6 +354,11 @@ describe Mongo::Server::ConnectionPool do
     end
 
     context 'connection of earlier generation than pool' do
+      # These tests are also applicable to load balancers, but
+      # require different setup and assertions because load balancers
+      # do not have a single global generation.
+      require_topology :single, :replica_set, :sharded
+
       let(:connection) do
         pool.check_out.tap do |connection|
           expect(connection).to receive(:generation).at_least(:once).and_return(0)
@@ -364,6 +374,11 @@ describe Mongo::Server::ConnectionPool do
     end
 
     context 'connection of later generation than pool' do
+      # These tests are also applicable to load balancers, but
+      # require different setup and assertions because load balancers
+      # do not have a single global generation.
+      require_topology :single, :replica_set, :sharded
+
       let(:connection) do
         pool.check_out.tap do |connection|
           expect(connection).to receive(:generation).at_least(:once).and_return(7)
@@ -449,6 +464,11 @@ describe Mongo::Server::ConnectionPool do
     end
 
     context 'when there is an available connection which is stale' do
+      # These tests are also applicable to load balancers, but
+      # require different setup and assertions because load balancers
+      # do not have a single global generation.
+      require_topology :single, :replica_set, :sharded
+
       let(:options) do
         { max_pool_size: 2, max_idle_time: 0.1 }
       end
@@ -489,13 +509,54 @@ describe Mongo::Server::ConnectionPool do
 
       context 'when the max size is reached' do
 
-        it 'raises a timeout error' do
-          expect(Mongo::Server::Connection).to receive(:new).once.and_call_original
-          expect {
-            pool.check_out
+        context 'without service_id' do
+          it 'raises a timeout error' do
+            expect(Mongo::Server::Connection).to receive(:new).once.and_call_original
             pool.check_out
-          }.to raise_error(::Timeout::Error)
-          expect(pool.size).to eq(1)
+            expect {
+              pool.check_out
+            }.to raise_error(::Timeout::Error)
+            expect(pool.size).to eq(1)
+          end
+        end
+
+        context 'with service_id' do
+          require_topology :load_balanced
+
+          let(:service_id) do
+            pool.with_connection do |connection|
+              connection.service_id.should_not be nil
+              connection.service_id
+            end
+          end
+
+          it 'raises a timeout error' do
+            expect(Mongo::Server::Connection).to receive(:new).once.and_call_original
+            service_id
+
+            pool.check_out(service_id: service_id)
+
+            expect {
+              pool.check_out(service_id: service_id)
+            }.to raise_error(Mongo::Error::ConnectionCheckOutTimeout)
+
+            expect(pool.size).to eq(1)
+          end
+
+          it 'waits for the timeout' do
+            expect(Mongo::Server::Connection).to receive(:new).once.and_call_original
+            service_id
+
+            pool.check_out(service_id: service_id)
+
+            start_time = Mongo::Utils.monotonic_time
+            expect {
+              pool.check_out(service_id: service_id)
+            }.to raise_error(Mongo::Error::ConnectionCheckOutTimeout)
+            elapsed_time = Mongo::Utils.monotonic_time - start_time
+
+            elapsed_time.should > 1
+          end
         end
       end
     end
@@ -541,7 +602,7 @@ describe Mongo::Server::ConnectionPool do
        it 'raises an error and emits ConnectionCheckOutFailedEvent' do
         pool
 
-        subscriber = EventSubscriber.new
+        subscriber = Mrss::EventSubscriber.new
         client.subscribe(Mongo::Monitoring::CONNECTION_POOL, subscriber)
 
         subscriber.clear_events!
@@ -579,6 +640,11 @@ describe Mongo::Server::ConnectionPool do
     end
 
     shared_examples_for 'disconnects and removes all connections in the pool and bumps generation' do
+      # These tests are also applicable to load balancers, but
+      # require different setup and assertions because load balancers
+      # do not have a single global generation.
+      require_topology :single, :replica_set, :sharded
+
       it 'disconnects and removes and bumps' do
         old_connections = []
         pool.instance_variable_get('@available_connections').each do |connection|