mongo 2.14.0.rc1 → 2.15.1

data/spec/mongo/client_encryption_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::ClientEncryption do
@@ -268,7 +271,7 @@ describe Mongo::ClientEncryption do
         it_behaves_like 'it creates a data key'
       end
 
-      context 'with invalid endpoint' do
+      context 'with https' do
         let(:options) do
           {
             master_key: {
@@ -279,20 +282,26 @@ describe Mongo::ClientEncryption do
           }
         end
 
-        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
+        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"
+            }
+          }
         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, expected_message)
+          end.to raise_error(Mongo::Error::KmsError, /SocketError/)
         end
       end
 

data/spec/mongo/client_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 # NB: tests for .new, #initialize, #use, #with and #dup are in
@@ -538,6 +541,23 @@ describe Mongo::Client do
     end
   end
 
+  describe '#database' do
+
+    let(:database) { client.database }
+
+    context 'when client has :server_api option' do
+
+      let(:client) do
+        new_local_client_nmio(['localhost'], server_api: {version: '1'})
+      end
+
+      it 'is not transfered to the collection' do
+        database.options[:server_api].should be nil
+      end
+    end
+
+  end
+
   describe '#database_names' do
 
     it 'returns a list of database names' do
@@ -727,6 +747,13 @@ describe Mongo::Client do
       expect(new_id).not_to eql(old_id)
     end
 
+    it 'replaces the session pool' do
+      old_id = client.cluster.session_pool.object_id
+      client.reconnect
+      new_id = client.cluster.session_pool.object_id
+      expect(new_id).not_to eql(old_id)
+    end
+
     it 'returns true' do
       expect(client.reconnect).to be(true)
     end

data/spec/mongo/cluster/cursor_reaper_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Cluster::CursorReaper do

data/spec/mongo/cluster/periodic_executor_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Cluster::PeriodicExecutor do

data/spec/mongo/cluster/socket_reaper_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Cluster::SocketReaper do

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
@@ -70,18 +73,18 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
     end
 
     let(:standalone_description) do
-      Mongo::Server::Description.new(address, { 'ismaster' => true,
+      Mongo::Server::Description.new(address, { 'isWritablePrimary' => true,
         'minWireVersion' => 2, 'maxWireVersion' => 8, 'ok' => 1 })
     end
 
     let(:replica_set_description) do
-      Mongo::Server::Description.new(address, { 'ismaster' => true,
+      Mongo::Server::Description.new(address, { 'isWritablePrimary' => true,
         'minWireVersion' => 2, 'maxWireVersion' => 8,
         'setName' => 'testing', 'ok' => 1 })
     end
 
     let(:replica_set_two_description) do
-      Mongo::Server::Description.new(address, { 'ismaster' => true,
+      Mongo::Server::Description.new(address, { 'isWritablePrimary' => true,
         'minWireVersion' => 2, 'maxWireVersion' => 8,
         'setName' => 'test', 'ok' => 1 })
     end
@@ -404,7 +407,7 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
 
       context 'description with non-nil max set version' do
         let(:description) do
-          Mongo::Server::Description.new('a', 'setVersion' => 5).tap do |description|
+          Mongo::Server::Description.new('a', { 'setVersion' => 5 }).tap do |description|
             expect(description.set_version).to eq(5)
           end
         end
@@ -438,7 +441,7 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
 
       context 'description with a higher max set version' do
         let(:description) do
-          Mongo::Server::Description.new('a', 'setVersion' => 5).tap do |description|
+          Mongo::Server::Description.new('a', { 'setVersion' => 5 }).tap do |description|
             expect(description.set_version).to eq(5)
           end
         end
@@ -450,7 +453,7 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
 
       context 'description with a lower max set version' do
         let(:description) do
-          Mongo::Server::Description.new('a', 'setVersion' => 3).tap do |description|
+          Mongo::Server::Description.new('a', { 'setVersion' => 3 }).tap do |description|
             expect(description.set_version).to eq(3)
           end
         end
@@ -488,7 +491,7 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
         let(:new_election_id) { BSON::ObjectId.from_string('7fffffff000000000000004f') }
 
         let(:description) do
-          Mongo::Server::Description.new('a', 'electionId' => new_election_id).tap do |description|
+          Mongo::Server::Description.new('a', { 'electionId' => new_election_id }).tap do |description|
             expect(description.election_id).to be new_election_id
           end
         end
@@ -526,7 +529,7 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
         let(:new_election_id) { BSON::ObjectId.from_string('7fffffff000000000000004f') }
 
         let(:description) do
-          Mongo::Server::Description.new('a', 'electionId' => new_election_id).tap do |description|
+          Mongo::Server::Description.new('a', { 'electionId' => new_election_id }).tap do |description|
             expect(description.election_id).to be new_election_id
           end
         end
@@ -540,7 +543,7 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
         let(:low_election_id) { BSON::ObjectId.from_string('7fffffff0000000000000042') }
 
         let(:description) do
-          Mongo::Server::Description.new('a', 'electionId' => low_election_id).tap do |description|
+          Mongo::Server::Description.new('a', { 'electionId' => low_election_id }).tap do |description|
             expect(description.election_id).to be low_election_id
           end
         end
@@ -565,7 +568,7 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     let(:desc) do
       Mongo::Server::Description.new(Mongo::Address.new('127.0.0.2:27017'))

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Cluster::Topology::Sharded do
@@ -64,12 +67,12 @@ describe Mongo::Cluster::Topology::Sharded do
   end
 
   let(:standalone_description) do
-    Mongo::Server::Description.new(address, { 'ismaster' => true,
+    Mongo::Server::Description.new(address, { 'isWritablePrimary' => true,
     'minWireVersion' => 2, 'maxWireVersion' => 8, 'ok' => 1 })
   end
 
   let(:replica_set_description) do
-    Mongo::Server::Description.new(address, { 'ismaster' => true,
+    Mongo::Server::Description.new(address, { 'isWritablePrimary' => true,
       'minWireVersion' => 2, 'maxWireVersion' => 8,
       'setName' => 'testing', 'ok' => 1 })
   end
@@ -135,7 +138,7 @@ describe Mongo::Cluster::Topology::Sharded do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     let(:desc1) do
       Mongo::Server::Description.new(Mongo::Address.new('127.0.0.2:27017'))

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Cluster::Topology::Single do
@@ -73,12 +76,12 @@ describe Mongo::Cluster::Topology::Single do
     end
 
     let(:standalone_description) do
-      Mongo::Server::Description.new(address, { 'ismaster' => true,
+      Mongo::Server::Description.new(address, { 'isWritablePrimary' => true,
         'minWireVersion' => 2, 'maxWireVersion' => 8, 'ok' => 1 })
     end
 
     let(:replica_set_description) do
-      Mongo::Server::Description.new(address, { 'ismaster' => true,
+      Mongo::Server::Description.new(address, { 'isWritablePrimary' => true,
         'minWireVersion' => 2, 'maxWireVersion' => 8,
         'setName' => 'testing' })
     end
@@ -175,7 +178,7 @@ describe Mongo::Cluster::Topology::Single do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     let(:desc) do
       Mongo::Server::Description.new(Mongo::Address.new('127.0.0.2:27017'))

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Cluster::Topology::Unknown do
@@ -86,7 +89,7 @@ describe Mongo::Cluster::Topology::Unknown do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     let(:desc) do
       Mongo::Server::Description.new(Mongo::Address.new('127.0.0.2:27017'))

data/spec/mongo/cluster/topology_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 describe Mongo::Cluster::Topology do
@@ -111,7 +114,7 @@ describe Mongo::Cluster::Topology do
   end
 
   describe '#logical_session_timeout' do
-    skip_if_linting
+    require_no_linting
 
     let(:listeners) do
       Mongo::Event::Listeners.new

data/spec/mongo/cluster_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Cluster do
@@ -274,27 +277,11 @@ describe Mongo::Cluster do
 
   describe '#add' do
 
-    context 'when topology is Single' do
-
-      let(:cluster) { cluster_with_semaphore }
-
-      let(:topology) do
-        Mongo::Cluster::Topology::Single.new({}, cluster)
-      end
-
-      before do
-        cluster.add('a')
-      end
-
-      it 'does not add discovered servers to the cluster' do
-        expect(cluster.servers[0].address.seed).to_not eq('a')
-      end
-    end
-
     context 'topology is Sharded' do
+      require_topology :sharded
 
       let(:topology) do
-        Mongo::Cluster::Topology::Single.new({}, cluster)
+        Mongo::Cluster::Topology::Sharded.new({}, cluster)
       end
 
       before do
@@ -309,6 +296,7 @@ describe Mongo::Cluster do
         expect(server).not_to be nil
 
         expect(server.last_scan).to be nil
+        expect(server.last_scan_monotime).to be nil
       end
     end
   end
@@ -368,6 +356,7 @@ describe Mongo::Cluster do
     end
 
     before do
+      cluster.next_primary
       cluster.servers.each do |server|
         expect(server).to receive(:reconnect!).and_call_original
       end

data/spec/mongo/cluster_time_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 describe Mongo::ClusterTime do

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Collection::View::Aggregation do

data/spec/mongo/collection/view/builder/find_command_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 describe Mongo::Collection::View::Builder::FindCommand do

data/spec/mongo/collection/view/builder/flags_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Collection::View::Builder::Flags do

data/spec/mongo/collection/view/builder/modifiers_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Collection::View::Builder::Modifiers do

data/spec/mongo/collection/view/builder/op_query_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Collection::View::Builder::OpQuery do

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Collection::View::ChangeStream do
@@ -44,8 +47,10 @@ describe Mongo::Collection::View::ChangeStream do
   end
 
   let(:connection_description) do
-    Mongo::Server::Description.new(double('description address'),
-      'minWireVersion' => 0, 'maxWireVersion' => 2)
+    Mongo::Server::Description.new(
+      double('description address'),
+      { 'minWireVersion' => 0, 'maxWireVersion' => 2 }
+    )
   end
 
   let(:result) do
@@ -183,7 +188,7 @@ describe Mongo::Collection::View::ChangeStream do
 
   context 'when a killCursors command is issued for the cursor' do
     context 'using Enumerable' do
-      only_mri
+      require_mri
 
       before do
         change_stream

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Collection::View::ChangeStream do
@@ -369,6 +372,19 @@ describe Mongo::Collection::View::ChangeStream do
 
   describe '#close' do
 
+    context 'ignores any exceptions or errors' do
+      [
+        Mongo::Error::OperationFailure,
+        Mongo::Error::SocketError,
+        Mongo::Error::SocketTimeoutError
+      ].each do |err|
+        it "ignores #{err}" do
+          expect(cursor).to receive(:close).and_raise(err)
+          change_stream.close
+        end
+      end
+    end
+
     context 'when documents have not been retrieved and the stream is closed' do
 
       before do