mongo 2.14.0.rc1 → 2.14.0

data/spec/mongo/crypt/binding/status_spec.rb

@@ -1,9 +1,4 @@
-require 'mongo'
-require 'support/lite_constraints'
-
-RSpec.configure do |config|
-  config.extend(LiteConstraints)
-end
+require 'lite_spec_helper'
 
 describe 'Mongo::Crypt::Binding' do
   describe 'mongocrypt_status_t binding' do

data/spec/mongo/crypt/binding/version_spec.rb

@@ -1,9 +1,4 @@
-require 'mongo'
-require 'support/lite_constraints'
-
-RSpec.configure do |config|
-  config.extend(LiteConstraints)
-end
+require 'lite_spec_helper'
 
 describe 'Mongo::Crypt::Binding' do
   require_libmongocrypt

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: 'endpoint/to/kms' } } }
+        let(:options) { { master_key: { region: 'us-east-2', key: 'arn', endpoint: 'kms.us-east-2.amazonaws.com:443' } } }
 
         it 'does not raise an exception' do
           expect do

data/spec/mongo/crypt/status_spec.rb

@@ -1,9 +1,4 @@
-require 'mongo'
-require 'support/lite_constraints'
-
-RSpec.configure do |config|
-  config.extend(LiteConstraints)
-end
+require 'lite_spec_helper'
 
 describe Mongo::Crypt::Status do
   require_libmongocrypt

data/spec/mongo/database_spec.rb

@@ -2,6 +2,19 @@ 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
@@ -228,6 +241,20 @@ 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
@@ -391,6 +418,25 @@ 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
@@ -541,6 +587,24 @@ 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

data/spec/mongo/monitoring/event/server_closed_spec.rb

@@ -24,7 +24,7 @@ describe Mongo::Monitoring::Event::ServerClosed do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     it 'renders correctly' do
       expect(topology).to receive(:server_descriptions).and_return({

data/spec/mongo/monitoring/event/server_opening_spec.rb

@@ -24,7 +24,7 @@ describe Mongo::Monitoring::Event::ServerOpening do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     it 'renders correctly' do
       expect(topology).to receive(:server_descriptions).and_return({

data/spec/mongo/monitoring/event/topology_changed_spec.rb

@@ -28,7 +28,7 @@ describe Mongo::Monitoring::Event::TopologyChanged do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     it 'renders correctly' do
       expect(prev_topology).to receive(:server_descriptions).and_return({

data/spec/mongo/monitoring/event/topology_closed_spec.rb

@@ -24,7 +24,7 @@ describe Mongo::Monitoring::Event::TopologyClosed do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     it 'renders correctly' do
       expect(topology).to receive(:server_descriptions).and_return({

data/spec/mongo/monitoring/event/topology_opening_spec.rb

@@ -24,7 +24,7 @@ describe Mongo::Monitoring::Event::TopologyOpening do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     it 'renders correctly' do
       expect(topology).to receive(:server_descriptions).and_return({

data/spec/mongo/operation/delete/op_msg_spec.rb

@@ -72,7 +72,7 @@ describe Mongo::Operation::Delete::OpMsg do
 
   describe 'write concern' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when write concern is not specified' do
 
@@ -99,7 +99,7 @@ describe Mongo::Operation::Delete::OpMsg do
 
   describe '#message' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when the server supports OP_MSG' do
 
@@ -152,7 +152,7 @@ describe Mongo::Operation::Delete::OpMsg do
 
         context 'when an implicit session is created and the topology is then updated and the server does not support sessions' do
           # Mocks on features are incompatible with linting
-          skip_if_linting
+          require_no_linting
 
           let(:expected_global_args) do
             global_args.dup.tap do |args|

data/spec/mongo/operation/insert/command_spec.rb

@@ -63,7 +63,7 @@ describe Mongo::Operation::Insert::Command do
 
   describe 'write concern' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when write concern is not specified' do
 
@@ -90,7 +90,7 @@ describe Mongo::Operation::Insert::Command do
 
   describe '#message' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when the server does not support OP_MSG' do
       max_server_version '3.4'

data/spec/mongo/operation/insert/op_msg_spec.rb

@@ -72,7 +72,7 @@ describe Mongo::Operation::Insert::OpMsg do
 
   describe 'write concern' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when write concern is not specified' do
 
@@ -99,7 +99,7 @@ describe Mongo::Operation::Insert::OpMsg do
 
   describe '#message' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when the server supports OP_MSG' do
       min_server_fcv '3.6'
@@ -167,7 +167,7 @@ describe Mongo::Operation::Insert::OpMsg do
 
         context 'when an implicit session is created and the topology is then updated and the server does not support sessions' do
           # Mocks on features are incompatible with linting
-          skip_if_linting
+          require_no_linting
 
           let(:expected_global_args) do
             global_args.dup.tap do |args|

data/spec/mongo/operation/read_preference_op_msg_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Mongo::Operation::SessionsSupported do
   # https://jira.mongodb.org/browse/RUBY-2224
-  skip_if_linting
+  require_no_linting
 
   let(:selector) do
     BSON::Document.new(name: 'test')

data/spec/mongo/operation/update/command_spec.rb

@@ -69,7 +69,7 @@ describe Mongo::Operation::Update::Command do
 
   describe 'write concern' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when write concern is not specified' do
 
@@ -96,7 +96,7 @@ describe Mongo::Operation::Update::Command do
 
   describe '#message' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when the server does not support OP_MSG' do
       max_server_version '3.4'

data/spec/mongo/operation/update/op_msg_spec.rb

@@ -78,7 +78,7 @@ describe Mongo::Operation::Update::OpMsg do
 
   describe 'write concern' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when write concern is not specified' do
 
@@ -105,7 +105,7 @@ describe Mongo::Operation::Update::OpMsg do
 
   describe '#message' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when the server supports OP_MSG' do
       min_server_fcv '3.6'
@@ -159,7 +159,7 @@ describe Mongo::Operation::Update::OpMsg do
 
         context 'when an implicit session is created and the topology is then updated and the server does not support sessions' do
           # Mocks on features are incompatible with linting
-          skip_if_linting
+          require_no_linting
 
           let(:expected_global_args) do
             global_args.dup.tap do |args|

data/spec/mongo/query_cache_spec.rb

@@ -149,6 +149,7 @@ describe Mongo::QueryCache do
 
     before do
       allow(result).to receive(:cursor_id) { 0 }
+      allow(result).to receive(:namespace) { 'db.coll' }
       allow(view).to receive(:limit) { nil }
     end
 

data/spec/mongo/server/app_metadata_shared.rb

@@ -10,7 +10,7 @@ shared_examples 'app metadata document' do
 
   it 'includes operating system information' do
     document[:client][:os][:type].should == 'linux'
-    if BSON::Environment.jruby?
+    if BSON::Environment.jruby? || RUBY_VERSION >= '3.0'
       document[:client][:os][:name].should == 'linux'
     else
       document[:client][:os][:name].should == 'linux-gnu'
@@ -19,7 +19,7 @@ shared_examples 'app metadata document' do
   end
 
   context 'mri' do
-    only_mri
+    require_mri
 
     it 'includes Ruby version' do
       document[:client][:platform].should start_with("Ruby #{RUBY_VERSION}")

data/spec/mongo/server/connection_spec.rb

@@ -774,7 +774,7 @@ describe Mongo::Server::Connection do
       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
+        require_no_linting
 
         let(:selector) do
           # The driver allows up to 16KiB for command overhead on top of

data/spec/mongo/server/description_spec.rb

@@ -27,6 +27,7 @@ describe Mongo::Server::Description do
       'logicalSessionTimeoutMinutes' => 7,
       'operationTime' => 1,
       '$clusterTime' => 1,
+      'connectionId' => 11,
       'ok' => 1
     }
   end
@@ -757,6 +758,23 @@ describe Mongo::Server::Description do
       end
     end
 
+    context 'when the configs match, but have different connectionId values' do
+
+      let(:description) do
+        described_class.new(address, replica)
+      end
+
+      let(:other) do
+        described_class.new(address, replica.merge(
+          'connectionId' => 12
+        ))
+      end
+
+      it 'returns true' do
+        expect(description == other).to be(true)
+      end
+    end
+
     context 'when the configs do not match' do
 
       let(:description) do

data/spec/mongo/server_selector_spec.rb

@@ -196,7 +196,7 @@ describe Mongo::ServerSelector do
   end
 
   describe "#select_server" do
-    skip_if_linting
+    require_no_linting
 
     context 'when #select_in_replica_set returns a list of nils' do
 
@@ -498,7 +498,7 @@ describe Mongo::ServerSelector do
   end
 
   describe '#filter_stale_servers' do
-    skip_if_linting
+    require_no_linting
 
     include_context 'server selector'
     let(:name) do

data/spec/mongo/socket/ssl_spec.rb

@@ -338,7 +338,7 @@ describe Mongo::Socket::SSL, retry: 3 do
       end
 
       context 'mri' do
-        only_mri
+        require_mri
 
         context 'when a bad certificate is provided' do
 
@@ -625,7 +625,7 @@ describe Mongo::Socket::SSL, retry: 3 do
         context 'bundled with intermediate cert' do
 
           # https://github.com/jruby/jruby-openssl/issues/181
-          only_mri
+          require_mri
 
           let(:ssl_options) do
             SpecConfig.instance.test_options.merge(
@@ -670,7 +670,7 @@ describe Mongo::Socket::SSL, retry: 3 do
         context 'bundled with intermediate cert' do
 
           # https://github.com/jruby/jruby-openssl/issues/181
-          only_mri
+          require_mri
 
           let(:ssl_options) do
             SpecConfig.instance.test_options.merge(

data/spec/runners/change_streams/test.rb

@@ -70,7 +70,7 @@ module Mongo
         if ClusterConfig.instance.server_version < '4.4' &&
           global_client.cluster.servers.length > 1
         then
-          mongos_each_direct_client do |client|
+          ::Utils.mongos_each_direct_client do |client|
             client.database.command(flushRouterConfig: 1)
           end
         end

data/spec/runners/crud/test_base.rb

@@ -45,25 +45,6 @@ module Mongo
           raise "Unknown target #{operation.object}"
         end
       end
-
-      # If the deployment is a sharded cluster, creates a direct client
-      # to each of the mongos nodes and yields each in turn to the
-      # provided block. Does nothing in other topologies.
-      def mongos_each_direct_client
-        if ClusterConfig.instance.topology == :sharded
-          client = ClientRegistry.instance.global_client('basic')
-          client.cluster.next_primary
-          client.cluster.servers.each do |server|
-            direct_client = ClientRegistry.instance.new_local_client(
-              [server.address.to_s],
-              SpecConfig.instance.test_options.merge(
-                connect: :sharded
-              ).merge(SpecConfig.instance.auth_options))
-            yield direct_client
-            direct_client.close
-          end
-        end
-      end
     end
   end
 end