mongo 2.13.3 → 2.14.0.rc1

data/spec/mongo/client_encryption_spec.rb

@@ -268,7 +268,7 @@ describe Mongo::ClientEncryption do
         it_behaves_like 'it creates a data key'
       end
 
-      context 'with https' do
+      context 'with invalid endpoint' do
         let(:options) do
           {
             master_key: {
@@ -279,26 +279,20 @@ describe Mongo::ClientEncryption do
           }
         end
 
-        it_behaves_like 'it creates a data key'
-      end
-
-      context 'with invalid endpoint' do
-        let(:options) do
-          {
-            master_key: {
-              key: aws_arn,
-              region: aws_region,
-              endpoint: "invalid-nonsense-endpoint.com"
-            }
-          }
+        let(:expected_message) do
+          # RUBY-2129: This error message could be more specific and inform the user
+          # that there is a problem with their KMS endpoint
+          if BSON::Environment.jruby?
+            /getservbyname.* failed/
+          else
+            /SocketError/
+          end
         end
 
         it 'raises an exception' do
-          # RUBY-2129: This error message could be more specific and inform the user
-          # that there is a problem with their KMS endpoint
           expect do
             data_key_id
-          end.to raise_error(Mongo::Error::KmsError, /SocketError/)
+          end.to raise_error(Mongo::Error::KmsError, expected_message)
         end
       end
 

data/spec/mongo/client_spec.rb

@@ -894,4 +894,44 @@ describe Mongo::Client do
       end
     end
   end
+
+  describe '#summary' do
+
+    context 'monitoring omitted' do
+      let(:client) do
+        new_local_client_nmio(
+          ['127.0.0.1:27017'],
+          :read => { :mode => :primary },
+          :database => SpecConfig.instance.test_db
+        )
+      end
+
+      it 'indicates lack of monitoring' do
+        client.summary.should =~ /servers=.*UNKNOWN.*NO-MONITORING/
+      end
+    end
+
+    context 'monitoring present' do
+      let(:client) do
+        authorized_client
+      end
+
+      it 'does not indicate lack of monitoring' do
+        client.summary.should =~ /servers=.*(STANDALONE|PRIMARY|MONGOS)/
+        client.summary.should_not =~ /servers=.*(STANDALONE|PRIMARY|MONGOS).*NO-MONITORING/
+      end
+    end
+
+    context 'background threads killed' do
+      let(:client) do
+        authorized_client.tap do |client|
+          client.cluster.servers.map(&:disconnect!)
+        end
+      end
+
+      it 'does not indicate lack of monitoring' do
+        client.summary.should =~ /servers=.*(STANDALONE|PRIMARY|MONGOS).*NO-MONITORING/
+      end
+    end
+  end
 end

data/spec/mongo/cluster/topology/single_spec.rb

@@ -113,19 +113,28 @@ describe Mongo::Cluster::Topology::Single do
           monitoring, temp_cluster)
       end
 
+      let(:server_1) do
+        double('server').tap do |server|
+          allow(server).to receive(:address).and_return(Mongo::Address.new('one'))
+        end
+      end
+
+      let(:server_2) do
+        double('server').tap do |server|
+          allow(server).to receive(:address).and_return(Mongo::Address.new('two'))
+        end
+      end
+
       let(:temp_cluster) do
         double('temp cluster').tap do |cluster|
-          allow(cluster).to receive(:servers_list).and_return([
-            double('server'),
-            double('server'),
-          ])
+          allow(cluster).to receive(:servers_list).and_return([server_1, server_2])
         end
       end
 
       it 'fails' do
         expect do
           topology
-        end.to raise_error(ArgumentError, 'Cannot instantiate a single topology with more than one server in the cluster')
+        end.to raise_error(ArgumentError, /Cannot instantiate a single topology with more than one server in the cluster: one, two/)
       end
     end
   end

data/spec/mongo/cluster_spec.rb

@@ -178,6 +178,9 @@ describe Mongo::Cluster do
     before do
       expect(server).to receive(:monitor).at_least(:once).and_return(monitor)
       expect(monitor).to receive(:scan!)
+
+      # scan! complains that there isn't a monitor on the server, calls summary
+      allow(monitor).to receive(:running?)
     end
 
     it 'returns true' do

data/spec/mongo/collection/view/explainable_spec.rb

@@ -20,12 +20,95 @@ describe Mongo::Collection::View::Explainable do
 
   describe '#explain' do
 
-    let(:explain) do
-      view.explain
+    shared_examples 'executes the explain' do
+      context '3.0+ server' do
+        min_server_fcv '3.0'
+
+        context 'not sharded' do
+          require_topology :single, :replica_set
+
+          it 'executes the explain' do
+            explain[:queryPlanner][:namespace].should == authorized_collection.namespace
+          end
+        end
+
+        context 'sharded' do
+          require_topology :sharded
+
+          context 'pre-3.2 server' do
+            max_server_version '3.0'
+
+            it 'executes the explain' do
+              explain[:queryPlanner][:parsedQuery].should be_a(Hash)
+            end
+          end
+
+          context '3.2+ server' do
+            min_server_fcv '3.2'
+
+            it 'executes the explain' do
+              explain[:queryPlanner][:mongosPlannerVersion].should == 1
+            end
+          end
+        end
+      end
+
+      context '2.6 server' do
+        max_server_version '2.6'
+
+        it 'executes the explain' do
+          explain[:cursor].should == 'BasicCursor'
+        end
+      end
+    end
+
+    context 'without arguments' do
+      let(:explain) do
+        view.explain
+      end
+
+      include_examples 'executes the explain'
     end
 
-    it 'executes an explain' do
-      expect(explain[:cursor] == 'BasicCursor' || explain[:queryPlanner]).to be_truthy
+    context 'with verbosity argument' do
+      let(:explain) do
+        view.explain(verbosity: verbosity)
+      end
+
+      shared_examples 'triggers server error' do
+        # 3.0 does not produce the error.
+        min_server_fcv '3.2'
+
+        it 'triggers server error' do
+          lambda do
+            explain
+          end.should raise_error(Mongo::Error::OperationFailure, /verbosity string must be/)
+        end
+      end
+
+      context 'valid symbol value' do
+        let(:verbosity) { :query_planner }
+
+        include_examples 'executes the explain'
+      end
+
+      context 'valid string value' do
+        let(:verbosity) { 'executionStats' }
+
+        include_examples 'executes the explain'
+      end
+
+      context 'invalid symbol value' do
+        let(:verbosity) { :bogus }
+
+        include_examples 'triggers server error'
+      end
+
+      context 'invalid string value' do
+        let(:verbosity) { 'bogus' }
+
+        include_examples 'triggers server error'
+      end
     end
   end
 end

data/spec/mongo/collection/view/map_reduce_spec.rb

@@ -581,6 +581,7 @@ describe Mongo::Collection::View::MapReduce do
 
       context 'when the server is not valid for writing' do
         clean_slate
+        require_warning_clean
 
         before do
           stop_monitoring(authorized_client)
@@ -661,6 +662,7 @@ describe Mongo::Collection::View::MapReduce do
 
       context 'when the server is a valid for writing' do
         clean_slate
+        require_warning_clean
 
         before do
           stop_monitoring(authorized_client)

data/spec/mongo/collection_spec.rb

@@ -821,6 +821,38 @@ describe Mongo::Collection do
           end
         end
 
+        context 'when write concern passed in as an option' do
+          min_server_fcv '3.4'
+          require_topology :replica_set
+
+          before do
+            database['collection_spec'].drop
+          end
+
+          let(:events) do
+            subscriber.command_started_events('create')
+          end
+
+          let(:options) do
+            { write_concern: {w: 1} }
+          end
+
+          let!(:collection) do
+            authorized_collection.with(options)
+          end
+
+          let!(:command) do
+            Utils.get_command_event(authorized_client, 'create') do |client|
+              collection.create({ write_concern: {w: 2} })
+            end.command
+          end
+
+          it 'applies the write concern passed in as an option' do
+            expect(events.length).to eq(1)
+            expect(command[:writeConcern][:w]).to eq(2)
+          end
+        end
+
         context 'when the server does not support write concern on the create command' do
           max_server_version '3.2'
 
@@ -1059,6 +1091,34 @@ describe Mongo::Collection do
           end
         end
 
+        context 'when write concern passed in as an option' do
+          min_server_fcv '3.4'
+          require_set_write_concern
+
+          let(:events) do
+            subscriber.command_started_events('drop')
+          end
+
+          let(:options) do
+            { write_concern: {w: 1} }
+          end
+
+          let!(:collection) do
+            authorized_collection.with(options)
+          end
+
+          let!(:command) do
+            Utils.get_command_event(authorized_client, 'drop') do |client|
+              collection.drop({ write_concern: {w: 0} })
+            end.command
+          end
+
+          it 'applies the write concern passed in as an option' do
+            expect(events.length).to eq(1)
+            expect(command[:writeConcern][:w]).to eq(0)
+          end
+        end
+
         context 'when the server does not support write concern on the drop command' do
           max_server_version '3.2'
 

data/spec/mongo/crypt/auto_decryption_context_spec.rb

@@ -76,7 +76,7 @@ describe Mongo::Crypt::AutoDecryptionContext do
       end
 
       let(:logger) do
-        ::Logger.new($stdout).tap do |logger|
+        ::Logger.new(STDOUT).tap do |logger|
           logger.level = ::Logger::DEBUG
         end
       end

data/spec/mongo/crypt/auto_encryption_context_spec.rb

@@ -93,7 +93,7 @@ describe Mongo::Crypt::AutoEncryptionContext do
       end
 
       let(:logger) do
-        ::Logger.new($stdout).tap do |logger|
+        ::Logger.new(STDOUT).tap do |logger|
           logger.level = ::Logger::DEBUG
         end
       end

data/spec/mongo/crypt/data_key_context_spec.rb

@@ -188,7 +188,7 @@ describe Mongo::Crypt::DataKeyContext do
       end
 
       context 'with valid endpoint' do
-        let(:options) { { master_key: { region: 'us-east-2', key: 'arn', endpoint: 'kms.us-east-2.amazonaws.com:443' } } }
+        let(:options) { { master_key: { region: 'us-east-2', key: 'arn', endpoint: 'endpoint/to/kms' } } }
 
         it 'does not raise an exception' do
           expect do

data/spec/mongo/crypt/explicit_decryption_context_spec.rb

@@ -57,7 +57,7 @@ describe Mongo::Crypt::ExplicitDecryptionContext do
       end
 
       let(:logger) do
-        ::Logger.new($stdout).tap do |logger|
+        ::Logger.new(STDOUT).tap do |logger|
           logger.level = ::Logger::DEBUG
         end
       end

data/spec/mongo/crypt/explicit_encryption_context_spec.rb

@@ -153,7 +153,7 @@ describe Mongo::Crypt::ExplicitEncryptionContext do
 
       let(:key_alt_name) { nil }
       let(:logger) do
-        ::Logger.new($stdout).tap do |logger|
+        ::Logger.new(STDOUT).tap do |logger|
           logger.level = ::Logger::DEBUG
         end
       end

data/spec/mongo/database_spec.rb

@@ -2,19 +2,6 @@ require 'spec_helper'
 
 describe Mongo::Database do
 
-  shared_context 'more than 100 collections' do
-    let(:client) do
-      root_authorized_client.use('many-collections')
-    end
-
-    before do
-      120.times do |i|
-        client["coll-#{i}"].drop
-        client["coll-#{i}"].create
-      end
-    end
-  end
-
   describe '#==' do
 
     let(:database) do
@@ -241,20 +228,6 @@ describe Mongo::Database do
         end
       end
     end
-
-    context 'when there are more than 100 collections' do
-      include_context 'more than 100 collections'
-
-      let(:collection_names) do
-        client.database.collection_names.sort
-      end
-
-      it 'lists all collections' do
-        collection_names.length.should == 120
-        collection_names.should include('coll-0')
-        collection_names.should include('coll-119')
-      end
-    end
   end
 
   describe '#list_collections' do
@@ -418,25 +391,6 @@ describe Mongo::Database do
         end
       end
     end
-
-    context 'when there are more than 100 collections' do
-      include_context 'more than 100 collections'
-
-      let(:collections) do
-        client.database.list_collections
-      end
-
-      let(:collection_names) do
-        # 2.6 server prefixes collection names with database name
-        collections.map { |info| info['name'].sub(/^many-collections\./, '') }.sort
-      end
-
-      it 'lists all collections' do
-        collections.length.should == 120
-        collection_names.should include('coll-0')
-        collection_names.should include('coll-119')
-      end
-    end
   end
 
   describe '#collections' do
@@ -587,24 +541,6 @@ describe Mongo::Database do
         end
       end
     end
-
-    context 'when there are more than 100 collections' do
-      include_context 'more than 100 collections'
-
-      let(:collections) do
-        client.database.collections
-      end
-
-      let(:collection_names) do
-        collections.map(&:name).sort
-      end
-
-      it 'lists all collections' do
-        collections.length.should == 120
-        collection_names.should include('coll-0')
-        collection_names.should include('coll-119')
-      end
-    end
   end
 
   describe '#command' do
@@ -889,6 +825,50 @@ describe Mongo::Database do
         end
       end
 
+      context 'when write concern is passed in as an option' do
+        min_server_fcv '3.4'
+        require_topology :single
+
+        let(:client_options) do
+          {
+            write_concern: {w: 0},
+            database: :test
+          }
+        end
+
+        let(:session) do
+          client.start_session
+        end
+
+        let(:subscriber) { EventSubscriber.new }
+
+        let(:client) do
+          root_authorized_client.tap do |client|
+            client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+          end.with(client_options)
+        end
+
+        let(:events) do
+          subscriber.command_started_events('dropDatabase')
+        end
+
+        let(:database_test_wc) do
+          client.database
+        end
+
+        let!(:command) do
+          Utils.get_command_event(client, 'dropDatabase') do |client|
+            database_test_wc.drop({ write_concern: {w: 'majority'} })
+          end.command
+        end
+
+        it 'applies the write concern passed in as an option' do
+          expect(events.length).to eq(1)
+          expect(command).to_not be_nil
+          expect(command[:writeConcern][:w]).to eq('majority')
+        end
+      end
+
       context 'when the server does not support write concern on the dropDatabase command' do
         max_server_version '3.2'
 

data/spec/mongo/error/no_server_available_spec.rb

@@ -16,7 +16,7 @@ describe Mongo::Error::NoServerAvailable do
     end
 
     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')
+      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 NO-MONITORING>]> with timeout=30, LT=0.015')
     end
 
     context 'when cluster is nil' do

data/spec/mongo/index/view_spec.rb

@@ -305,8 +305,7 @@ describe Mongo::Index::View do
                     { key: { testing: -1 }, unique: true },
                     { commit_quorum: 'unsupported-value' }
                   )
-                # 4.4.4 changed the text of the error message
-                end.to raise_error(Mongo::Error::OperationFailure, /Commit quorum cannot be satisfied with the current replica set configuration|No write concern mode named 'unsupported-value' found in replica set configuration/)
+                end.to raise_error(Mongo::Error::OperationFailure, /Commit quorum cannot be satisfied with the current replica set configuration/)
               end
             end
           end
@@ -965,8 +964,7 @@ describe Mongo::Index::View do
           it 'raises an exception' do
             expect do
               view.create_one({ 'x' => 1 }, commit_quorum: 'unsupported-value')
-            # 4.4.4 changed the text of the error message
-            end.to raise_error(Mongo::Error::OperationFailure, /Commit quorum cannot be satisfied with the current replica set configuration|No write concern mode named 'unsupported-value' found in replica set configuration/)
+            end.to raise_error(Mongo::Error::OperationFailure, /Commit quorum cannot be satisfied with the current replica set configuration/)
           end
         end
       end

data/spec/mongo/logger_spec.rb

@@ -6,6 +6,16 @@ describe Mongo::Logger do
     described_class.logger
   end
 
+  around do |example|
+    saved_logger = Mongo::Logger.logger
+
+    begin
+      example.run
+    ensure
+      Mongo::Logger.logger = saved_logger
+    end
+  end
+
   describe '.logger' do
 
     context 'when no logger has been set' do
@@ -18,25 +28,21 @@ describe Mongo::Logger do
         Mongo::Logger.logger = nil
       end
 
-      after do
-        Mongo::Logger.logger = test_logger
-      end
-
       it 'returns the default logger' do
-        expect(logger.level).to eq(Logger::DEBUG)
+        expect(logger.level).to eq(Logger::INFO)
       end
     end
 
     context 'when a logger has been set' do
 
       let(:info) do
-        Logger.new($stdout).tap do |log|
+        Logger.new(STDOUT).tap do |log|
           log.level = Logger::INFO
         end
       end
 
       let(:debug) do
-        Logger.new($stdout).tap do |log|
+        Logger.new(STDOUT).tap do |log|
           log.level = Logger::DEBUG
         end
       end
@@ -45,10 +51,6 @@ describe Mongo::Logger do
         described_class.logger = debug
       end
 
-      after do
-        described_class.logger = info
-      end
-
       it 'returns the provided logger' do
         expect(logger.level).to eq(Logger::DEBUG)
       end

data/spec/mongo/operation/read_preference_legacy_spec.rb

@@ -46,10 +46,10 @@ describe Mongo::Operation::ReadPreferenceSupported do
     end
   end
 
-  describe '#add_slave_ok_flag?' do
+  describe '#add_slave_ok_flag_maybe' do
 
     let(:actual) do
-      operation.send(:add_slave_ok_flag?, connection)
+      operation.send(:add_slave_ok_flag_maybe, operation.send(:options), connection)
     end
 
     shared_examples_for 'sets the slave_ok flag as expected' do
@@ -60,7 +60,9 @@ describe Mongo::Operation::ReadPreferenceSupported do
 
     shared_examples_for 'never sets slave_ok' do
 
-      let(:expected) { false }
+      let(:expected) do
+        { }
+      end
 
       context 'when no read preference is specified' do
         let(:read_pref) { Mongo::ServerSelector.get }
@@ -83,7 +85,9 @@ describe Mongo::Operation::ReadPreferenceSupported do
 
     shared_examples_for 'always sets slave_ok' do
 
-      let(:expected) { true }
+      let(:expected) do
+        { :flags => [ :slave_ok ] }
+      end
 
       context 'when no read preference is specified' do
         let(:read_pref) { Mongo::ServerSelector.get }
@@ -110,7 +114,9 @@ describe Mongo::Operation::ReadPreferenceSupported do
 
         let(:read_pref) { Mongo::ServerSelector.get }
 
-        let(:expected) { false }
+        let(:expected) do
+          { }
+        end
 
         it_behaves_like 'sets the slave_ok flag as expected'
       end
@@ -121,7 +127,9 @@ describe Mongo::Operation::ReadPreferenceSupported do
 
           let(:read_pref) { Mongo::ServerSelector.get(:mode => :secondary) }
 
-          let(:expected) { true }
+          let(:expected) do
+            { :flags => [ :slave_ok ] }
+          end
 
           it_behaves_like 'sets the slave_ok flag as expected'
         end
@@ -130,7 +138,9 @@ describe Mongo::Operation::ReadPreferenceSupported do
 
           let(:read_pref) { Mongo::ServerSelector.get(:mode => :primary) }
 
-          let(:expected) { false }
+          let(:expected) do
+            { }
+          end
 
           it_behaves_like 'sets the slave_ok flag as expected'
         end
@@ -196,7 +206,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
     end
   end
 
-  describe '#add_read_preference_legacy' do
+  describe '#update_selector_for_read_pref' do
 
     let(:read_pref) do
       Mongo::ServerSelector.get(:mode => mode)
@@ -205,7 +215,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
     # Behavior of sending $readPreference is the same regardless of topology.
     shared_examples_for '$readPreference in the command' do
       let(:actual) do
-        operation.send(:add_read_preference_legacy, operation.send(:selector), connection)
+        operation.send(:update_selector_for_read_pref, operation.send(:selector), connection)
       end
 
       let(:expected_read_preference) do