various cosmetic fixes + new spec robustness

Author: jarthod

lib/mongo/error/unexpected_response.rb

@@ -28,9 +28,10 @@ class UnexpectedResponse < Error
       # @param [ Integer ] expected_response_to The last request id sent.
       # @param [ Integer ] response_to The actual response_to of the reply.
       #
-      # @since 2.1.0
+      # @since 2.2.6
       def initialize(expected_response_to, response_to)
-        super("Unexpected response. Got response for request ID #{response_to} but expected response for request ID #{expected_response_to}")
+        super("Unexpected response. Got response for request ID #{response_to} " +
+              "but expected response for request ID #{expected_response_to}")
       end
     end
   end

lib/mongo/server/connectable.rb

@@ -88,9 +88,9 @@ def ensure_connected
         ensure_same_process!
         connect!
         begin
-          res = yield socket
+          result = yield socket
           success = true
-          res
+          result
         ensure
           success or disconnect!
         end

spec/mongo/server/connection_spec.rb

@@ -281,7 +281,8 @@
       it 'raises an UnexpectedResponse' do
         expect {
           connection.dispatch([ query_alice ])
-        }.to raise_error(Mongo::Error::UnexpectedResponse, /Unexpected response. Got response for request ID \d+ but expected response for request ID \d+/)
+        }.to raise_error(Mongo::Error::UnexpectedResponse,
+          /Got response for request ID \d+ but expected response for request ID \d+/)
       end
 
       it "doesn't break subsequent requests" do
@@ -319,13 +320,13 @@
         authorized_collection.delete_many
       end
 
-      it "closes the socket and doesn't leak into subsequent requests" do
+      it "closes the socket and does not use it for subsequent requests" do
         t = Thread.new {
           # Kill the thread just before the reply is read
-          expect(Mongo::Protocol::Reply).to receive(:deserialize) { t.kill }
+          allow(Mongo::Protocol::Reply).to receive(:deserialize) { t.kill }
           connection.dispatch([ query_bob ])
         }
-        t.join(1)
+        t.join(2)
         allow(Mongo::Protocol::Reply).to receive(:deserialize).and_call_original
         expect(connection.dispatch([ query_alice ]).documents.first['name']).to eq('alice')
       end