mongo 2.11.6 → 2.12.0.rc0

data/spec/mongo/protocol/query_spec.rb

@@ -1,17 +1,17 @@
-# encoding: UTF-8
-require 'spec_helper'
+require 'lite_spec_helper'
+require 'support/shared/protocol'
 
 describe Mongo::Protocol::Query do
 
   let(:opcode)   { 2004 }
   let(:db)       { SpecConfig.instance.test_db }
-  let(:coll)     { TEST_COLL }
-  let(:ns)       { "#{db}.#{coll}" }
+  let(:collection_name) { 'protocol-test' }
+  let(:ns)       { "#{db}.#{collection_name}" }
   let(:selector) { { :name => 'Tyler' } }
   let(:options)     { Hash.new }
 
   let(:message) do
-    described_class.new(db, coll, selector, options)
+    described_class.new(db, collection_name, selector, options)
   end
 
   describe '#initialize' do
@@ -66,7 +66,7 @@ describe Mongo::Protocol::Query do
 
       context 'when the fields are equal' do
         let(:other) do
-          described_class.new(db, coll, selector, options)
+          described_class.new(db, collection_name, selector, options)
         end
 
         it 'returns true' do
@@ -76,7 +76,7 @@ describe Mongo::Protocol::Query do
 
       context 'when the database is not equal' do
         let(:other) do
-          described_class.new('tyler', coll, selector, options)
+          described_class.new('tyler', collection_name, selector, options)
         end
 
         it 'returns false' do
@@ -96,7 +96,7 @@ describe Mongo::Protocol::Query do
 
       context 'when the selector is not equal' do
         let(:other) do
-          described_class.new(db, coll, { :a => 1 }, options)
+          described_class.new(db, collection_name, { :a => 1 }, options)
         end
 
         it 'returns false' do
@@ -106,7 +106,7 @@ describe Mongo::Protocol::Query do
 
       context 'when the options are not equal' do
         let(:other) do
-          described_class.new(db, coll, selector, :skip => 2)
+          described_class.new(db, collection_name, selector, :skip => 2)
         end
 
         it 'returns false' do
@@ -225,7 +225,7 @@ describe Mongo::Protocol::Query do
       context 'when the namespace contains unicode characters' do
         let(:field) { bytes.to_s[20..40] }
 
-        let(:coll) do
+        let(:collection_name) do
           'områder'
         end
 
@@ -320,7 +320,7 @@ describe Mongo::Protocol::Query do
       end
 
       it 'returns a compressed message' do
-        expect(message.compress!('zlib')).to be_a(Mongo::Protocol::Compressed)
+        expect(message.maybe_compress('zlib')).to be_a(Mongo::Protocol::Compressed)
       end
     end
 
@@ -335,7 +335,7 @@ describe Mongo::Protocol::Query do
         context "when the command is #{command}" do
 
           it 'does not allow compression for the command' do
-            expect(message.compress!('zlib')).to be(message)
+            expect(message.maybe_compress('zlib')).to be(message)
           end
         end
       end

data/spec/mongo/protocol/registry_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require 'lite_spec_helper'
 
 describe Mongo::Protocol::Registry do
 

data/spec/mongo/protocol/reply_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lite_spec_helper'
 
 describe Mongo::Protocol::Reply do
 

data/spec/mongo/protocol/update_spec.rb

@@ -1,17 +1,18 @@
-require 'spec_helper'
+require 'lite_spec_helper'
+require 'support/shared/protocol'
 
 describe Mongo::Protocol::Update do
 
   let(:opcode)   { 2001 }
   let(:db)       { SpecConfig.instance.test_db }
-  let(:coll)     { TEST_COLL }
-  let(:ns)       { "#{db}.#{coll}" }
+  let(:collection_name) { 'protocol-test' }
+  let(:ns)       { "#{db}.#{collection_name}" }
   let(:selector) { { :name => 'Tyler' } }
   let(:update_doc) { { :name => 'Bob' } }
   let(:options)       { Hash.new }
 
   let(:message) do
-    described_class.new(db, coll, selector, update_doc, options)
+    described_class.new(db, collection_name, selector, update_doc, options)
   end
 
   describe '#initialize' do
@@ -35,7 +36,7 @@ describe Mongo::Protocol::Update do
 
       context 'when the fields are equal' do
         let(:other) do
-          described_class.new(db, coll, selector, update_doc, options)
+          described_class.new(db, collection_name, selector, update_doc, options)
         end
 
         it 'returns true' do
@@ -45,7 +46,7 @@ describe Mongo::Protocol::Update do
 
       context 'when the database is not equal' do
         let(:other) do
-          described_class.new('tyler', coll, selector, update_doc, options)
+          described_class.new('tyler', collection_name, selector, update_doc, options)
         end
 
         it 'returns false' do
@@ -65,7 +66,7 @@ describe Mongo::Protocol::Update do
 
       context 'when the selector is not equal' do
         let(:other) do
-          described_class.new(db, coll, { :a => 1 }, update_doc, options)
+          described_class.new(db, collection_name, { :a => 1 }, update_doc, options)
         end
 
         it 'returns false' do
@@ -75,7 +76,7 @@ describe Mongo::Protocol::Update do
 
       context 'when the update document is not equal' do
         let(:other) do
-          described_class.new(db, coll, selector, { :a => 1 }, options)
+          described_class.new(db, collection_name, selector, { :a => 1 }, options)
         end
 
         it 'returns false' do
@@ -85,7 +86,7 @@ describe Mongo::Protocol::Update do
 
       context 'when the options are not equal' do
         let(:other) do
-          described_class.new(db, coll, selector, update_doc,
+          described_class.new(db, collection_name, selector, update_doc,
                               :flags => :upsert)
         end
 

data/spec/mongo/server/connection_pool_spec.rb

@@ -487,7 +487,7 @@ describe Mongo::Server::ConnectionPool do
           expect {
             pool.check_out
             pool.check_out
-          }.to raise_error(Timeout::Error)
+          }.to raise_error(::Timeout::Error)
           expect(pool.size).to eq(1)
         end
       end

data/spec/mongo/server/connection_spec.rb

@@ -532,7 +532,9 @@ describe Mongo::Server::Connection, retry: 3 do
           user: SpecConfig.instance.test_user.name,
           password: SpecConfig.instance.test_user.password,
         ))
-      )
+      ).tap do |connection|
+        connection.connect!
+      end
     end
 
     let(:documents) do
@@ -627,14 +629,24 @@ describe Mongo::Server::Connection, retry: 3 do
       context 'linting' do
         require_linting
 
-        it 'marks the connection no longer usable' do
+        it 'does not permit sending over the connection' do
           expect {
             connection.dispatch([ query_alice ])
           }.to raise_error(Mongo::Error::UnexpectedResponse)
 
           expect do
             connection.dispatch([ query_alice ]).documents
-          end.to raise_error(Mongo::Error::LintError, /Reconnecting closed connections is no longer supported.*/)
+          end.to raise_error(Mongo::Error::LintError, /Trying to deliver a message over a disconnected connection/)
+        end
+
+        it 'marks the connection no longer usable' do
+          expect {
+            connection.dispatch([ query_alice ])
+          }.to raise_error(Mongo::Error::UnexpectedResponse)
+
+          expect do
+            connection.connect!
+          end.to raise_error(Mongo::Error::LintError, /Reconnecting closed connections is no longer supported/)
         end
       end
 
@@ -714,9 +726,15 @@ describe Mongo::Server::Connection, retry: 3 do
       end
 
       context 'when the message is a command' do
+        # Server description is frozen when linting is enabled, which is
+        # incompatible with expectations set on it in this test
+        skip_if_linting
 
         let(:selector) do
-          { :getlasterror => '1' }
+          # The driver allows up to 16KiB for command overhead on top of
+          # the max bson object size reported by the server.
+          # Add that much padding.
+          { :getlasterror => '1', 'padding' => 'x'*16384 }
         end
 
         let(:command) do
@@ -730,7 +748,8 @@ describe Mongo::Server::Connection, retry: 3 do
         it 'checks the size against the max bson size' do
           # 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_any_instance_of(Mongo::Server::Description).to receive(
+            :max_bson_object_size).at_least(:once).and_return(10)
           expect do
             reply
           end.to raise_exception(Mongo::Error::MaxBSONSize)
@@ -862,7 +881,9 @@ describe Mongo::Server::Connection, retry: 3 do
       context 'when the socket_timeout is negative' do
 
         let(:connection) do
-          described_class.new(server, server.options)
+          described_class.new(server, server.options).tap do |connection|
+            connection.connect!
+          end
         end
 
         let(:message) do
@@ -871,7 +892,7 @@ describe Mongo::Server::Connection, retry: 3 do
 
         before do
           expect(message).to receive(:replyable?) { false }
-          connection.send(:deliver, message)
+          connection.send(:deliver, message, nil)
 
           connection.send(:socket).instance_variable_set(:@timeout, -(Time.now.to_i))
         end

data/spec/mongo/socket_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Mongo::Socket do
 
   let(:socket) do
-    described_class.new(Socket::PF_INET)
+    described_class.new
   end
 
   describe '#address' do

data/spec/mongo/timeout_spec.rb

@@ -0,0 +1,85 @@
+require 'lite_spec_helper'
+
+describe Mongo::Timeout do
+  describe '#timeout' do
+    let(:default_error_message) { 'execution expired' }
+    let(:custom_error_class) { Mongo::Error::SocketTimeoutError }
+    let(:custom_error_message) { 'socket timed out' }
+
+    context 'Ruby version older than 2.4.0' do
+      before do
+        unless RUBY_VERSION < '2.4.0'
+          skip 'This test requires a Ruby version older than 2.4.0'
+        end
+      end
+
+      context 'with time argument' do
+        it 'raises StandardError' do
+          expect do
+            Mongo::Timeout.timeout(0.1) do
+              sleep 1
+            end
+          end.to raise_error(::Timeout::Error, default_error_message)
+        end
+      end
+
+      context 'with time and class arguments' do
+        it 'raises the specified error class' do
+          expect do
+            Mongo::Timeout.timeout(0.1, custom_error_class) do
+              sleep 1
+            end
+          end.to raise_error(custom_error_class, default_error_message)
+        end
+      end
+
+      context 'with time, class, and message arguments' do
+        it 'raises the specified error class but ignores the message' do
+          expect do
+            Mongo::Timeout.timeout(0.1, custom_error_class, custom_error_message) do
+              sleep 1
+            end
+          end.to raise_error(custom_error_class, default_error_message)
+        end
+      end
+    end
+
+    context 'Ruby 2.4.0 or newer' do
+      before do
+        unless RUBY_VERSION >= '2.4.0'
+          skip 'This test requires a Ruby 2.4.0 or newer'
+        end
+      end
+
+      context 'with time argument' do
+        it 'raises StandardError' do
+          expect do
+            Mongo::Timeout.timeout(0.1) do
+              sleep 1
+            end
+          end.to raise_error(::Timeout::Error, default_error_message)
+        end
+      end
+
+      context 'with time and class arguments' do
+        it 'raises the specified error class' do
+          expect do
+            Mongo::Timeout.timeout(0.1, custom_error_class) do
+              sleep 1
+            end
+          end.to raise_error(custom_error_class, default_error_message)
+        end
+      end
+
+      context 'with time, class, and message arguments' do
+        it 'raises the specified error class with message' do
+          expect do
+            Mongo::Timeout.timeout(0.1, custom_error_class, custom_error_message) do
+              sleep 1
+            end
+          end.to raise_error(custom_error_class, custom_error_message)
+        end
+      end
+    end
+  end
+end

data/spec/mongo/uri/srv_protocol_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'lite_spec_helper'
 
 describe Mongo::URI::SRVProtocol do
-  clean_slate_for_all
+  clean_slate_for_all_if_possible
 
   let(:scheme) { 'mongodb+srv://' }
   let(:uri) { described_class.new(string) }

data/spec/mongo/uri_spec.rb

@@ -6,6 +6,40 @@ describe Mongo::URI do
 
     let(:uri) { described_class.get(string) }
 
+    describe 'invalid uris' do
+
+      context 'string is not uri' do
+
+        let(:string) { 'tyler' }
+
+        it 'raises an error' do
+          expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+        end
+      end
+
+      context 'nil' do
+
+        let(:string) { nil }
+
+        it 'raises an error' do
+          expect do
+            uri
+          end.to raise_error(Mongo::Error::InvalidURI, /URI must be a string, not nil/)
+        end
+      end
+
+      context 'empty string' do
+
+        let(:string) { '' }
+
+        it 'raises an error' do
+          expect do
+            uri
+          end.to raise_error(Mongo::Error::InvalidURI, /Cannot parse an empty URI/)
+        end
+      end
+    end
+
     context 'when the scheme is mongodb://' do
 
       let(:string) do
@@ -55,12 +89,25 @@ describe Mongo::URI do
       end
     end
 
+    context 'nil' do
+
+      let(:string) { nil }
+
+      it 'raises an error' do
+        expect do
+          uri
+        end.to raise_error(Mongo::Error::InvalidURI, /URI must be a string, not nil/)
+      end
+    end
+
     context 'empty string' do
 
       let(:string) { '' }
 
       it 'raises an error' do
-        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+        expect do
+          uri
+        end.to raise_error(Mongo::Error::InvalidURI, /Cannot parse an empty URI/)
       end
     end
 
@@ -880,9 +927,9 @@ describe Mongo::URI do
           let(:password) { 's3kr4t' }
 
           it 'does not allow a client to be created' do
-            expect {
+            expect do
               new_local_client_nmio(string)
-            }.to raise_error(Mongo::Auth::InvalidConfiguration, /password is not supported/)
+            end.to raise_error(Mongo::Auth::InvalidConfiguration, /Password is not supported/)
           end
         end
 
@@ -925,9 +972,9 @@ describe Mongo::URI do
         end
 
         it 'does not allow a client to be created with default auth mechanism' do
-          expect {
+          expect do
             new_local_client_nmio(string)
-          }.to raise_error(Mongo::Auth::InvalidConfiguration, /empty username is not supported/)
+          end.to raise_error(Mongo::Auth::InvalidConfiguration, /Empty username is not supported/)
         end
       end
     end