mongo 2.11.0.rc0 → 2.11.0

data/spec/mongo/auth/x509_spec.rb

@@ -11,10 +11,40 @@ describe Mongo::Auth::X509 do
   end
 
   let(:user) do
-    Mongo::Auth::User.new(database: SpecConfig.instance.test_db, user: 'driver', password: 'password')
+    Mongo::Auth::User.new(database: '$external')
+  end
+
+  describe '#initialize' do
+
+    context 'when user specifies database $external' do
+
+      let(:user) do
+        Mongo::Auth::User.new(database: '$external')
+      end
+
+      it 'works' do
+        described_class.new(user)
+      end
+    end
+
+    context 'when user specifies database other than $external' do
+
+      let(:user) do
+        Mongo::Auth::User.new(database: 'foo')
+      end
+
+      it 'raises InvalidConfiguration' do
+        expect do
+          described_class.new(user)
+        end.to raise_error(Mongo::Auth::InvalidConfiguration, /User specifies auth source 'foo', but the only valid auth source for X.509 is '\$external'/)
+      end
+    end
   end
 
   describe '#login' do
+    # When x509 auth is configured, the login would work and this test
+    # requires the login to fail.
+    require_no_x509_auth
 
     context 'when the user is not authorized for the database' do
 

data/spec/mongo/bulk_write_spec.rb

@@ -1924,11 +1924,11 @@ describe Mongo::BulkWrite do
             end
 
             let(:first_txn_number) do
-              started_events[-2].command['txnNumber'].instance_variable_get(:@integer)
+              started_events[-2].command['txnNumber'].value
             end
 
             let(:second_txn_number) do
-              started_events[-1].command['txnNumber'].instance_variable_get(:@integer)
+              started_events[-1].command['txnNumber'].value
             end
 
             it 'inserts the documents' do

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

@@ -118,8 +118,8 @@ describe Mongo::Collection::View::ChangeStream do
 
     context 'when full_document is not provided' do
 
-      it "defaults to use the 'default' value" do
-        expect(change_stream_document[:fullDocument]).to eq('default')
+      it "does not set fullDocument" do
+        expect(change_stream_document).not_to have_key(:fullDocument)
       end
     end
 

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

@@ -641,8 +641,10 @@ describe Mongo::Collection::View::Readable do
           view.distinct(nil)
         end
 
-        it 'returns an empty array' do
-          expect(distinct).to be_empty
+        it 'raises ArgumentError' do
+          expect do
+            distinct
+          end.to raise_error(ArgumentError, 'Field name for distinct operation must be not nil')
         end
       end
 
@@ -696,8 +698,10 @@ describe Mongo::Collection::View::Readable do
           view.distinct(nil)
         end
 
-        it 'returns an empty array' do
-          expect(distinct).to be_empty
+        it 'raises ArgumentError' do
+          expect do
+            distinct
+          end.to raise_error(ArgumentError, 'Field name for distinct operation must be not nil')
         end
       end
     end

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

@@ -5,7 +5,9 @@ describe Mongo::Cursor::Builder::GetMoreCommand do
   describe '#specification' do
 
     let(:reply) do
-      Mongo::Protocol::Reply.allocate
+      Mongo::Protocol::Reply.allocate.tap do |reply|
+        allow(reply).to receive(:cursor_id).and_return(8000)
+      end
     end
 
     let(:result) do
@@ -54,7 +56,7 @@ describe Mongo::Cursor::Builder::GetMoreCommand do
       end
 
       it 'includes getMore with cursor id' do
-        expect(selector[:getMore]).to eq(cursor.id)
+        expect(selector[:getMore]).to eq(BSON::Int64.new(8000))
       end
 
       it 'includes the collection name' do

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

@@ -5,7 +5,9 @@ describe Mongo::Cursor::Builder::OpGetMore do
   describe '#specification' do
 
     let(:reply) do
-      Mongo::Protocol::Reply.allocate
+      Mongo::Protocol::Reply.allocate.tap do |reply|
+        allow(reply).to receive(:cursor_id).and_return(8000)
+      end
     end
 
     let(:result) do
@@ -38,7 +40,7 @@ describe Mongo::Cursor::Builder::OpGetMore do
     end
 
     it 'includes the cursor id' do
-      expect(specification[:cursor_id]).to eq(cursor.id)
+      expect(specification[:cursor_id]).to eq(BSON::Int64.new(8000))
     end
 
     it 'includes the database name' do

data/spec/mongo/cursor_spec.rb

@@ -318,7 +318,7 @@ describe Mongo::Cursor do
         Mongo::Collection::View.new(
             authorized_collection,
             {},
-            :batch_size => 2
+            :batch_size => 2,
         )
       end
 
@@ -329,9 +329,9 @@ describe Mongo::Cursor do
 
       it 'schedules a kill cursors op' do
         cluster.instance_variable_get(:@periodic_executor).flush
-        expect {
+        expect do
           cursor.to_a
-        }.to raise_exception(Mongo::Error::OperationFailure, /[cC]ursor.*not found/)
+        end.to raise_exception(Mongo::Error::OperationFailure, /[cC]ursor.*not found/)
       end
 
       context 'when the cursor is unregistered before the kill cursors operations are executed' do

data/spec/mongo/retryable_spec.rb

@@ -175,83 +175,62 @@ describe Mongo::Retryable do
 
     context 'when an operation failure occurs' do
 
-      context 'when the cluster is not a mongos' do
+      context 'when the operation failure is not retryable' do
+
+        let(:error) do
+          Mongo::Error::OperationFailure.new('not authorized')
+        end
 
         before do
-          expect(operation).to receive(:execute).and_raise(Mongo::Error::OperationFailure).ordered
-          expect(cluster).to receive(:sharded?).and_return(false)
+          expect(operation).to receive(:execute).and_raise(error).ordered
         end
 
-        it 'raises an exception' do
+        it 'raises the exception' do
           expect {
             read_operation
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
 
-      context 'when the cluster is a mongos' do
+      context 'when the operation failure is retryable' do
 
-        context 'when the operation failure is not retryable' do
+        let(:error) do
+          Mongo::Error::OperationFailure.new('not master')
+        end
 
-          let(:error) do
-            Mongo::Error::OperationFailure.new('not authorized')
-          end
+        context 'when the retry succeeds' do
 
           before do
+            expect(retryable).to receive(:select_server).ordered
             expect(operation).to receive(:execute).and_raise(error).ordered
-            expect(cluster).to receive(:sharded?).and_return(true)
+            expect(client).to receive(:read_retry_interval).and_return(0.1).ordered
+            expect(retryable).to receive(:select_server).ordered
+            expect(operation).to receive(:execute).and_return(true).ordered
           end
 
-          it 'raises the exception' do
-            expect {
-              read_operation
-            }.to raise_error(Mongo::Error::OperationFailure)
+          it 'returns the result' do
+            expect(read_operation).to be true
           end
         end
 
-        context 'when the operation failure is retryable' do
+        context 'when the retry fails once and then succeeds' do
+          let(:max_read_retries) { 2 }
 
-          let(:error) do
-            Mongo::Error::OperationFailure.new('not master')
-          end
-
-          context 'when the retry succeeds' do
+          before do
+            expect(retryable).to receive(:select_server).ordered
+            expect(operation).to receive(:execute).and_raise(error).ordered
 
-            before do
-              expect(retryable).to receive(:select_server).ordered
-              expect(operation).to receive(:execute).and_raise(error).ordered
-              expect(cluster).to receive(:sharded?).and_return(true)
-              expect(client).to receive(:read_retry_interval).and_return(0.1).ordered
-              expect(retryable).to receive(:select_server).ordered
-              expect(operation).to receive(:execute).and_return(true).ordered
-            end
+            expect(client).to receive(:read_retry_interval).and_return(0.1).ordered
+            expect(retryable).to receive(:select_server).ordered
+            expect(operation).to receive(:execute).and_raise(error).ordered
 
-            it 'returns the result' do
-              expect(read_operation).to be true
-            end
+            expect(client).to receive(:read_retry_interval).and_return(0.1).ordered
+            expect(retryable).to receive(:select_server).ordered
+            expect(operation).to receive(:execute).and_return(true).ordered
           end
 
-          context 'when the retry fails once and then succeeds' do
-            let(:max_read_retries) { 2 }
-
-            before do
-              expect(retryable).to receive(:select_server).ordered
-              expect(operation).to receive(:execute).and_raise(error).ordered
-
-              expect(cluster).to receive(:sharded?).and_return(true)
-              expect(client).to receive(:read_retry_interval).and_return(0.1).ordered
-              expect(retryable).to receive(:select_server).ordered
-              expect(operation).to receive(:execute).and_raise(error).ordered
-
-              expect(cluster).to receive(:sharded?).and_return(true)
-              expect(client).to receive(:read_retry_interval).and_return(0.1).ordered
-              expect(retryable).to receive(:select_server).ordered
-              expect(operation).to receive(:execute).and_return(true).ordered
-            end
-
-            it 'returns the result' do
-              expect(read_operation).to be true
-            end
+          it 'returns the result' do
+            expect(read_operation).to be true
           end
         end
       end

data/spec/mongo/server/connection_auth_spec.rb

@@ -46,6 +46,7 @@ describe Mongo::Server::Connection, retry: 3 do
   end
 
   describe '#auth_mechanism' do
+    require_no_x509_auth
 
     let(:connection) do
       described_class.new(server, server.options)
@@ -87,6 +88,8 @@ describe Mongo::Server::Connection, retry: 3 do
     end
 
     context 'when the ismaster response indicates the auth mechanism is :scram' do
+      require_no_x509_auth
+
       let(:features) do
         Mongo::Server::Description::Features.new(0..7)
       end

data/spec/mongo/server/connection_pool_spec.rb

@@ -24,6 +24,10 @@ describe Mongo::Server::ConnectionPool do
 
   declare_topology_double
 
+  let(:app_metadata) do
+    Mongo::Server::AppMetadata.new(server_options)
+  end
+
   let(:cluster) do
     double('cluster').tap do |cl|
       allow(cl).to receive(:topology).and_return(topology)

data/spec/mongo/server/connection_spec.rb

@@ -289,6 +289,7 @@ describe Mongo::Server::Connection, retry: 3 do
     end
 
     context 'when user credentials exist' do
+      require_no_x509_auth
 
       let(:server) { monitored_server }
 
@@ -458,9 +459,11 @@ describe Mongo::Server::Connection, retry: 3 do
       described_class.new(
         server,
         SpecConfig.instance.test_options.merge(
-          :user => SpecConfig.instance.test_user.name,
-          :password => SpecConfig.instance.test_user.password,
-          :database => SpecConfig.instance.test_user.database )
+          :database => SpecConfig.instance.test_user.database,
+        ).merge(SpecConfig.instance.credentials_or_x509(
+          user: SpecConfig.instance.test_user.name,
+          password: SpecConfig.instance.test_user.password,
+        ))
       )
     end
 
@@ -657,7 +660,9 @@ describe Mongo::Server::Connection, retry: 3 do
         end
 
         it 'checks the size against the max bson size' do
-          expect_any_instance_of(Mongo::Server).to receive(:max_bson_object_size).at_least(:once).and_return(100)
+          # 100 works for non-x509 auth.
+          # 10 is needed for x509 auth due to smaller payloads, apparently.
+          expect_any_instance_of(Mongo::Server).to receive(:max_bson_object_size).at_least(:once).and_return(10)
           expect do
             reply
           end.to raise_exception(Mongo::Error::MaxBSONSize)
@@ -950,6 +955,7 @@ describe Mongo::Server::Connection, retry: 3 do
     end
 
     context 'when authentication options are provided' do
+      require_no_x509_auth
 
       let(:connection) do
         described_class.new(
@@ -1100,6 +1106,8 @@ describe Mongo::Server::Connection, retry: 3 do
     end
 
     context 'when auth options differ from server' do
+      require_no_x509_auth
+
       let(:connection) do
         described_class.new(server, server.options.merge(user: 'foo'))
       end

data/spec/mongo/server/monitor_spec.rb

@@ -158,7 +158,7 @@ describe Mongo::Server::Monitor do
   end
 =end
 
-  describe '#restart!' do
+  describe '#run!' do
 
     let!(:thread) do
       monitor.run!
@@ -182,6 +182,24 @@ describe Mongo::Server::Monitor do
         expect(monitor.restart!).not_to be(thread)
       end
     end
+
+    context 'when running after a stop' do
+      it 'starts the thread' do
+        ClientRegistry.instance.close_all_clients
+        thread
+        sleep 0.5
+
+        RSpec::Mocks.with_temporary_scope do
+          expect(monitor.connection).to receive(:disconnect!).and_call_original
+          monitor.stop!
+          sleep 0.5
+          expect(thread.alive?).to be false
+          new_thread = monitor.run!
+          sleep 0.5
+          expect(new_thread.alive?).to be(true)
+        end
+      end
+    end
   end
 
   describe '#stop' do

data/spec/mongo/socket/ssl_spec.rb

@@ -225,7 +225,7 @@ describe Mongo::Socket::SSL, retry: 3 do
     context 'when a certificate is passed, but it is not of the right type' do
 
       let(:options) do
-        cert = "This is a string, not a X509 Certificate"
+        cert = "This is a string, not an X.509 Certificate"
         {
           :ssl => true,
           :ssl_cert_object => cert,

data/spec/mongo/uri/srv_protocol_spec.rb

@@ -713,19 +713,6 @@ describe Mongo::URI::SRVProtocol do
             expect(client.options[:auth_source]).to eq(source)
           end
         end
-
-        context '$external' do
-          let(:source) { '$external' }
-          let(:expected) { :external }
-
-          it 'sets the auth source to :external' do
-            expect(uri.uri_options[:auth_source]).to eq(expected)
-          end
-
-          it 'sets the options on a client created with the uri' do
-            expect(client.options[:auth_source]).to eq(expected)
-          end
-        end
       end
 
       context 'auth mechanism properties provided' do

data/spec/mongo/uri_option_parsing_spec.rb

@@ -242,14 +242,6 @@ describe Mongo::URI do
 
     it_behaves_like 'a string option'
 
-    context '$external' do
-      let(:string) { "mongodb://example.com/?#{uri_option}=$external" }
-
-      it 'is converted to ;external' do
-        expect(uri.uri_options[ruby_option]).to eq(:external)
-      end
-    end
-
     context 'empty' do
       let(:string) { "mongodb://example.com/?#{uri_option}=" }
 

data/spec/mongo/uri_spec.rb

@@ -729,7 +729,7 @@ describe Mongo::URI do
 
         context 'when mechanism_properties are provided' do
           let(:options) { "authMechanism=#{mechanism}&authMechanismProperties=CANONICALIZE_HOST_NAME:true" }
-          
+
           it 'does not allow a client to be created' do
             expect {
               new_local_client_nmio(string)
@@ -758,7 +758,7 @@ describe Mongo::URI do
 
         context 'when mechanism_properties are provided' do
           let(:options) { "authMechanism=#{mechanism}&authMechanismProperties=CANONICALIZE_HOST_NAME:true" }
-          
+
           it 'does not allow a client to be created' do
             expect {
               new_local_client_nmio(string)
@@ -799,7 +799,7 @@ describe Mongo::URI do
 
         context 'when mechanism_properties are provided' do
           let(:options) { "authMechanism=#{mechanism}&authMechanismProperties=SERVICE_NAME:other,CANONICALIZE_HOST_NAME:true" }
-          
+
           it 'sets the options on a client created with the uri' do
             client = new_local_client_nmio(string)
             expect(client.options[:auth_mech_properties]).to eq({ 'canonicalize_host_name' => true, 'service_name' => 'other' })
@@ -827,7 +827,7 @@ describe Mongo::URI do
 
         context 'when mechanism_properties are provided' do
           let(:options) { "authMechanism=#{mechanism}&authMechanismProperties=CANONICALIZE_HOST_NAME:true" }
-          
+
           it 'does not allow a client to be created' do
             expect {
               new_local_client_nmio(string)
@@ -878,7 +878,7 @@ describe Mongo::URI do
         context 'when a password is provided' do
           let(:credentials) { "#{user}:#{password}"}
           let(:password) { 's3kr4t' }
-          
+
           it 'does not allow a client to be created' do
             expect {
               new_local_client_nmio(string)
@@ -888,7 +888,7 @@ describe Mongo::URI do
 
         context 'when mechanism_properties are provided' do
           let(:options) { "authMechanism=#{mechanism}&authMechanismProperties=CANONICALIZE_HOST_NAME:true" }
-          
+
           it 'does not allow a client to be created' do
             expect {
               new_local_client_nmio(string)
@@ -947,20 +947,6 @@ describe Mongo::URI do
           expect(client.options[:auth_source]).to eq(source)
         end
       end
-
-      context '$external' do
-        let(:source) { '$external' }
-        let(:expected) { :external }
-
-        it 'sets the auth source to :external' do
-          expect(uri.uri_options[:auth_source]).to eq(expected)
-        end
-
-        it 'sets the options on a client created with the uri' do
-          client = new_local_client_nmio(string)
-          expect(client.options[:auth_source]).to eq(expected)
-        end
-      end
     end
 
     context 'auth mechanism properties provided' do