mongo 2.7.0 → 2.7.1

data/spec/mongo/cursor_spec.rb

@@ -356,7 +356,8 @@ describe Mongo::Cursor do
     end
   end
 
-  context 'when an implicit session is used', if: sessions_enabled? do
+  context 'when an implicit session is used' do
+    min_server_fcv '3.6'
 
     let(:collection) do
       subscribed_client[TEST_COLL]
@@ -400,7 +401,9 @@ describe Mongo::Cursor do
       end
     end
 
-    context 'when a getMore is needed to retrieve all results', if: sessions_enabled? && !sharded? do
+    context 'when a getMore is needed to retrieve all results' do
+      min_server_fcv '3.6'
+      require_topology :single, :replica_set
 
       let(:documents) do
         (1..4).map{ |i| { field: "test#{i}" }}

data/spec/mongo/database_spec.rb

@@ -119,7 +119,7 @@ describe Mongo::Database do
 
     context 'when specifying a batch size' do
 
-      it 'returns the stripped names of the collections', unless: need_to_skip_on_sharded_auth_40? do
+      it 'returns the stripped names of the collections' do
         expect(database.collection_names(batch_size: 1).to_a).to include('users')
       end
     end
@@ -135,7 +135,7 @@ describe Mongo::Database do
         end
       end
 
-      it 'returns all collections', unless: need_to_skip_on_sharded_auth_40? do
+      it 'returns all collections' do
         expect(database.collection_names(batch_size: 1).select { |c| c =~ /dalmatians/}.size).to eq(2)
       end
 
@@ -159,12 +159,20 @@ describe Mongo::Database do
       database[:users].create
     end
 
-    it 'returns a list of the collections info', if: list_command_enabled?  do
-      expect(result).to include('users')
+    context 'server 3.0+' do
+      min_server_fcv '3.0'
+
+      it 'returns a list of the collections info' do
+        expect(result).to include('users')
+      end
     end
 
-    it 'returns a list of the collections info', unless: list_command_enabled?  do
-      expect(result).to include("#{SpecConfig.instance.test_db}.users")
+    context 'server 2.6' do
+      max_server_fcv '2.6'
+
+      it 'returns a list of the collections info' do
+        expect(result).to include("#{SpecConfig.instance.test_db}.users")
+      end
     end
   end
 
@@ -205,7 +213,8 @@ describe Mongo::Database do
       end
     end
 
-    context 'when the user is not authorized', if: auth_enabled? do
+    context 'when the user is not authorized' do
+      require_auth
 
       let(:database) do
         described_class.new(unauthorized_client, SpecConfig.instance.test_db)
@@ -233,7 +242,8 @@ describe Mongo::Database do
       expect(database.command({:ismaster => 1}.freeze).written_count).to eq(0)
     end
 
-    context 'when provided a session', if: sessions_enabled? do
+    context 'when provided a session' do
+      min_server_fcv '3.6'
 
       let(:operation) do
         client.database.command({ :ismaster => 1 }, session: session)
@@ -268,7 +278,7 @@ describe Mongo::Database do
     end
 
     context 'when a read concern is provided' do
-      min_server_version '3.2'
+      min_server_fcv '3.2'
 
       context 'when the read concern is valid' do
 
@@ -280,7 +290,9 @@ describe Mongo::Database do
       end
 
       context 'when the read concern is not valid' do
-        it 'raises an exception', if: !sharded? do
+        require_topology :single, :replica_set
+
+        it 'raises an exception' do
           expect {
             database.command(:ismaster => 1, readConcern: { level: 'yay' })
           }.to raise_error(Mongo::Error::OperationFailure)
@@ -288,7 +300,8 @@ describe Mongo::Database do
       end
     end
 
-    context 'when no read preference is provided', unless: sharded? do
+    context 'when no read preference is provided' do
+      require_topology :single, :replica_set
 
       let!(:primary_server) do
         database.cluster.next_primary
@@ -303,7 +316,8 @@ describe Mongo::Database do
       end
     end
 
-    context 'when the client has a read preference set', unless: sharded? do
+    context 'when the client has a read preference set' do
+      require_topology :single, :replica_set
 
       let!(:primary_server) do
         database.cluster.next_primary
@@ -330,7 +344,8 @@ describe Mongo::Database do
       end
     end
 
-    context 'when there is a read preference argument provided', unless: sharded? do
+    context 'when there is a read preference argument provided' do
+      require_topology :single, :replica_set
 
       let(:read_preference) do
         { :mode => :secondary, :tag_sets => [{ 'non' => 'existent' }] }
@@ -355,7 +370,8 @@ describe Mongo::Database do
       end
     end
 
-    context 'when the client has a server_selection_timeout set', unless: sharded? do
+    context 'when the client has a server_selection_timeout set' do
+      require_topology :single, :replica_set
 
       let(:client) do
         authorized_client.with(server_selection_timeout: 0)
@@ -374,7 +390,8 @@ describe Mongo::Database do
 
     context 'when a write concern is not defined on the client/database object' do
 
-      context 'when a write concern is provided in the selector', if: standalone? do
+      context 'when a write concern is provided in the selector' do
+        require_topology :single
 
         let(:cmd) do
           {
@@ -418,7 +435,8 @@ describe Mongo::Database do
         end
       end
 
-      context 'when a write concern is provided in the command selector', if: standalone? do
+      context 'when a write concern is provided in the command selector' do
+        require_topology :single
 
         let(:cmd) do
           {
@@ -477,7 +495,9 @@ describe Mongo::Database do
         client.database
       end
 
-      context 'when the server supports write concern on the dropDatabase command', if: (collation_enabled? && standalone?) do
+      context 'when the server supports write concern on the dropDatabase command' do
+        min_server_fcv '3.4'
+        require_topology :single
 
         it 'applies the write concern' do
           expect{
@@ -486,7 +506,8 @@ describe Mongo::Database do
         end
       end
 
-      context 'when the server does not support write concern on the dropDatabase command', unless: collation_enabled? do
+      context 'when the server does not support write concern on the dropDatabase command' do
+        max_server_version '3.2'
 
         it 'does not apply the write concern' do
           expect(database_with_write_options.drop).to be_successful
@@ -537,7 +558,8 @@ describe Mongo::Database do
     end
   end
 
-  describe '#fs', unless: sharded? do
+  describe '#fs' do
+    require_topology :single, :replica_set
 
     let(:database) do
       described_class.new(authorized_client, SpecConfig.instance.test_db)

data/spec/mongo/error/no_server_available_spec.rb

@@ -16,7 +16,7 @@ describe Mongo::Error::NoServerAvailable do
     end
 
     it 'is correct' do
-      expect(error.message).to eq('No primary server is available in cluster: #<Cluster topology=Unknown[127.0.0.1:27017] servers=[]> with timeout=30, LT=0.015')
+      expect(error.message).to eq('No primary server is available in cluster: #<Cluster topology=Unknown[127.0.0.1:27017] servers=[#<Server address=127.0.0.1:27017 UNKNOWN>]> with timeout=30, LT=0.015')
     end
   end
 end

data/spec/mongo/error/parser_spec.rb

@@ -256,4 +256,33 @@ describe Mongo::Error::Parser do
       end
     end
   end
+
+  describe '#wtimeout' do
+    let(:parser) do
+      described_class.new(document)
+    end
+
+    context 'when document contains wtimeout' do
+      let(:document) do
+        { 'ok' => 1, 'writeConcernError' => {
+          'errmsg' => 'replication timed out', 'code' => 64,
+          'errInfo' => {'wtimeout' => true}} }
+      end
+
+      it 'returns true' do
+        expect(parser.wtimeout).to be true
+      end
+    end
+
+    context 'when document does not contain wtimeout' do
+      let(:document) do
+        { 'ok' => 1, 'writeConcernError' => {
+          'errmsg' => 'replication did not time out', 'code' => 55 }}
+      end
+
+      it 'returns nil' do
+        expect(parser.wtimeout).to be nil
+      end
+    end
+  end
 end

data/spec/mongo/grid/stream/write_spec.rb

@@ -96,7 +96,8 @@ describe Mongo::Grid::FSBucket::Stream::Write do
       end
     end
 
-    context 'when the fs has a write concern', if: standalone? do
+    context 'when the fs has a write concern' do
+      require_topology :single
 
       let(:fs_options) do
         { write: INVALID_WRITE_CONCERN }

data/spec/mongo/index/view_spec.rb

@@ -87,7 +87,8 @@ describe Mongo::Index::View do
         view_with_write_concern.drop_one('another_-1')
       end
 
-      context 'when the server accepts writeConcern for the dropIndexes operation', if: collation_enabled? do
+      context 'when the server accepts writeConcern for the dropIndexes operation' do
+        min_server_fcv '3.4'
 
         it 'applies the write concern' do
           expect {
@@ -96,7 +97,8 @@ describe Mongo::Index::View do
         end
       end
 
-      context 'when the server does not accept writeConcern for the dropIndexes operation', unless: collation_enabled? do
+      context 'when the server does not accept writeConcern for the dropIndexes operation' do
+        max_server_version '3.2'
 
         it 'does not apply the write concern' do
           expect(result).to be_successful
@@ -104,7 +106,8 @@ describe Mongo::Index::View do
       end
     end
 
-    context 'when there are multiple indexes with the same key pattern', if: collation_enabled? do
+    context 'when there are multiple indexes with the same key pattern' do
+      min_server_fcv '3.4'
 
       before do
         view.create_one({ random: 1 }, unique: true)
@@ -187,7 +190,8 @@ describe Mongo::Index::View do
           view_with_write_concern.drop_all
         end
 
-        context 'when the server accepts writeConcern for the dropIndexes operation', if: collation_enabled? do
+        context 'when the server accepts writeConcern for the dropIndexes operation' do
+          min_server_fcv '3.4'
 
           it 'applies the write concern' do
             expect {
@@ -196,7 +200,8 @@ describe Mongo::Index::View do
           end
         end
 
-        context 'when the server does not accept writeConcern for the dropIndexes operation', unless: collation_enabled? do
+        context 'when the server does not accept writeConcern for the dropIndexes operation' do
+          max_server_version '3.2'
 
           it 'does not apply the write concern' do
             expect(result).to be_successful
@@ -253,7 +258,8 @@ describe Mongo::Index::View do
           end
         end
 
-        context 'when collation is specified', if: collation_enabled? do
+        context 'when collation is specified' do
+          min_server_fcv '3.4'
 
           let(:result) do
             view.create_many(
@@ -267,7 +273,8 @@ describe Mongo::Index::View do
             view.get('random_1')
           end
 
-          context 'when the server supports collations', if: collation_enabled? do
+          context 'when the server supports collations' do
+            min_server_fcv '3.4'
 
             it 'returns ok' do
               expect(result).to be_successful
@@ -281,7 +288,8 @@ describe Mongo::Index::View do
             end
           end
 
-          context 'when the server does not support collations', unless: collation_enabled? do
+          context 'when the server does not support collations' do
+            max_server_version '3.2'
 
             it 'raises an exception' do
               expect {
@@ -325,7 +333,8 @@ describe Mongo::Index::View do
             )
           end
 
-          context 'when the server accepts writeConcern for the createIndexes operation', if: collation_enabled? do
+          context 'when the server accepts writeConcern for the createIndexes operation' do
+            min_server_fcv '3.4'
 
             it 'applies the write concern' do
               expect {
@@ -334,7 +343,8 @@ describe Mongo::Index::View do
             end
           end
 
-          context 'when the server does not accept writeConcern for the createIndexes operation', unless: collation_enabled? do
+          context 'when the server does not accept writeConcern for the createIndexes operation' do
+            max_server_version '3.2'
 
             it 'does not apply the write concern' do
               expect(result).to be_successful
@@ -398,7 +408,8 @@ describe Mongo::Index::View do
             view.get('random_1')
           end
 
-          context 'when the server supports collations', if: collation_enabled? do
+          context 'when the server supports collations' do
+            min_server_fcv '3.4'
 
             it 'returns ok' do
               expect(result).to be_successful
@@ -412,7 +423,8 @@ describe Mongo::Index::View do
             end
           end
 
-          context 'when the server does not support collations', unless: collation_enabled? do
+          context 'when the server does not support collations' do
+            max_server_version '3.2'
 
             it 'raises an exception' do
               expect {
@@ -456,7 +468,8 @@ describe Mongo::Index::View do
                              ])
           end
 
-          context 'when the server accepts writeConcern for the createIndexes operation', if: collation_enabled? do
+          context 'when the server accepts writeConcern for the createIndexes operation' do
+            min_server_fcv '3.4'
 
             it 'applies the write concern' do
               expect {
@@ -465,7 +478,8 @@ describe Mongo::Index::View do
             end
           end
 
-          context 'when the server does not accept writeConcern for the createIndexes operation', unless: collation_enabled? do
+          context 'when the server does not accept writeConcern for the createIndexes operation' do
+            max_server_version '3.2'
 
             it 'does not apply the write concern' do
               expect(result).to be_successful
@@ -545,7 +559,8 @@ describe Mongo::Index::View do
           view_with_write_concern.create_one(spec, unique: true)
         end
 
-        context 'when the server accepts writeConcern for the createIndexes operation', if: collation_enabled? do
+        context 'when the server accepts writeConcern for the createIndexes operation' do
+          min_server_fcv '3.4'
 
           it 'applies the write concern' do
             expect {
@@ -554,7 +569,8 @@ describe Mongo::Index::View do
           end
         end
 
-        context 'when the server does not accept writeConcern for the createIndexes operation', unless: collation_enabled? do
+        context 'when the server does not accept writeConcern for the createIndexes operation' do
+          max_server_version '3.2'
 
           it 'does not apply the write concern' do
             expect(result).to be_successful
@@ -615,7 +631,7 @@ describe Mongo::Index::View do
     end
 
     context 'when providing an invalid partial index filter' do
-      min_server_version '3.2'
+      min_server_fcv '3.2'
 
       it 'raises an exception' do
         expect {
@@ -625,7 +641,7 @@ describe Mongo::Index::View do
     end
 
     context 'when providing a valid partial index filter' do
-      min_server_version '3.2'
+      min_server_fcv '3.2'
 
       let(:expression) do
         {'a' => {'$lte' => 1.5}}
@@ -732,18 +748,19 @@ describe Mongo::Index::View do
     end
 
     context 'when the collection does not exist' do
+      min_server_fcv '3.0'
 
-      let(:nonexistant_collection) do
+      let(:nonexistent_collection) do
         authorized_client[:not_a_collection]
       end
 
-      let(:nonexistant_view) do
-        described_class.new(nonexistant_collection)
+      let(:nonexistent_view) do
+        described_class.new(nonexistent_collection)
       end
 
-      it 'raises a nonexistant collection error', if: list_command_enabled? do
+      it 'raises a nonexistent collection error' do
         expect {
-          nonexistant_view.each.to_a
+          nonexistent_view.each.to_a
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end
@@ -809,7 +826,8 @@ describe Mongo::Index::View do
         end
       end
 
-      context 'when the server supports collations', if: collation_enabled? do
+      context 'when the server supports collations' do
+        min_server_fcv '3.4'
 
         let(:extended_options) do
           options.merge(:collation => { locale: 'en_US' } )

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

@@ -113,8 +113,9 @@ describe Mongo::Operation::Delete::OpMsg do
         authorized_client.start_session
       end
 
-      context 'when the topology is replica set or sharded', if: (replica_set? || sharded?) do
-        min_server_version '3.6'
+      context 'when the topology is replica set or sharded' do
+        min_server_fcv '3.6'
+        require_topology :replica_set, :sharded
 
         let(:expected_global_args) do
           global_args.merge(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
@@ -127,8 +128,9 @@ describe Mongo::Operation::Delete::OpMsg do
         end
       end
 
-      context 'when the topology is standalone', if: standalone? do
-        min_server_version '3.6'
+      context 'when the topology is standalone' do
+        min_server_fcv '3.6'
+        require_topology :single
 
         let(:expected_global_args) do
           global_args
@@ -178,7 +180,7 @@ describe Mongo::Operation::Delete::OpMsg do
           end
 
           context 'when the topology is replica set or sharded' do
-            min_server_version '3.6'
+            min_server_fcv '3.6'
             require_topology :replica_set, :sharded
 
             let(:expected_global_args) do
@@ -195,7 +197,9 @@ describe Mongo::Operation::Delete::OpMsg do
             end
           end
 
-          context 'when the topology is standalone', if: standalone? && sessions_enabled? do
+          context 'when the topology is standalone' do
+            min_server_fcv '3.6'
+            require_topology :single
 
             let(:expected_global_args) do
               global_args.dup.tap do |args|
@@ -212,7 +216,7 @@ describe Mongo::Operation::Delete::OpMsg do
         end
 
         context 'when the session is explicit' do
-          min_server_version '3.6'
+          min_server_fcv '3.6'
           require_topology :replica_set, :sharded
 
           let(:session) do