mongo 2.6.4 → 2.7.0.rc0

data/spec/mongo/operation/delete_spec.rb

@@ -1,6 +1,16 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Delete do
+  before do
+    begin
+      authorized_collection.delete_many
+    rescue Mongo::Error::OperationFailure
+    end
+    begin
+      authorized_collection.indexes.drop_all
+    rescue Mongo::Error::OperationFailure
+    end
+  end
 
   let(:document) do
     {
@@ -11,9 +21,9 @@ describe Mongo::Operation::Delete do
 
   let(:spec) do
     { :deletes        => [ document ],
-      :db_name       => TEST_DB,
+      :db_name       => SpecConfig.instance.test_db,
       :coll_name     => TEST_COLL,
-      :write_concern => Mongo::WriteConcern.get(WRITE_CONCERN),
+      :write_concern => Mongo::WriteConcern.get(SpecConfig.instance.write_concern),
       :ordered       => true
     }
   end
@@ -47,9 +57,9 @@ describe Mongo::Operation::Delete do
 
         let(:other_spec) do
           { :deletes        => [ other_doc ],
-            :db_name       => TEST_DB,
+            :db_name       => SpecConfig.instance.test_db,
             :coll_name     => TEST_COLL,
-            :write_concern => Mongo::WriteConcern.get(WRITE_CONCERN),
+            :write_concern => Mongo::WriteConcern.get(SpecConfig.instance.write_concern),
             :ordered       => true
           }
         end
@@ -80,9 +90,9 @@ describe Mongo::Operation::Delete do
       let(:delete) do
         described_class.new({
           deletes: [ document ],
-          db_name: TEST_DB,
+          db_name: SpecConfig.instance.test_db,
           coll_name: TEST_COLL,
-          write_concern: Mongo::WriteConcern.get(WRITE_CONCERN)
+          write_concern: Mongo::WriteConcern.get(SpecConfig.instance.write_concern)
         })
       end
 
@@ -124,9 +134,9 @@ describe Mongo::Operation::Delete do
       let(:delete) do
         described_class.new({
           deletes: [ document ],
-          db_name: TEST_DB,
+          db_name: SpecConfig.instance.test_db,
           coll_name: TEST_COLL,
-          write_concern: Mongo::WriteConcern.get(WRITE_CONCERN)
+          write_concern: Mongo::WriteConcern.get(SpecConfig.instance.write_concern)
         })
       end
 
@@ -183,12 +193,13 @@ describe Mongo::Operation::Delete do
       end
     end
 
-    context 'when write concern { w: 0 } is used', unless: op_msg_enabled? do
+    context 'when write concern { w: 0 } is used' do
+      max_server_version '3.4'
 
       let(:delete) do
         described_class.new({
                               deletes: [ document ],
-                              db_name: TEST_DB,
+                              db_name: SpecConfig.instance.test_db,
                               coll_name: TEST_COLL,
                               write_concern: Mongo::WriteConcern.get(:w => 0)
                             })

data/spec/mongo/operation/drop_index_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mongo::Operation::DropIndex do
+  before do
+    authorized_collection.indexes.drop_all
+  end
 
   describe '#execute' do
 
@@ -16,7 +19,7 @@ describe Mongo::Operation::DropIndex do
 
       let(:operation) do
         described_class.new(
-          db_name: TEST_DB,
+          db_name: SpecConfig.instance.test_db,
           coll_name: TEST_COLL,
           index_name: 'another_-1'
         )
@@ -35,7 +38,7 @@ describe Mongo::Operation::DropIndex do
 
       let(:operation) do
         described_class.new(
-          db_name: TEST_DB,
+          db_name: SpecConfig.instance.test_db,
           coll_name: TEST_COLL,
           index_name: 'another_blah'
         )

data/spec/mongo/operation/find/legacy_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Find::Legacy, unless: op_msg_enabled? do
-  
+describe Mongo::Operation::Find::Legacy do
+  max_server_version '3.4'
+
   let(:selector) { { foo: 1 } }
   let(:query_options) { {} }
   let(:spec) do

data/spec/mongo/operation/get_more_spec.rb

@@ -11,7 +11,7 @@ describe Mongo::Operation::GetMore::Legacy do
   end
 
   let(:spec) do
-    { :db_name   => TEST_DB,
+    { :db_name   => SpecConfig.instance.test_db,
       :coll_name => TEST_COLL,
       :to_return => to_return,
       :cursor_id => cursor_id }
@@ -46,7 +46,7 @@ describe Mongo::Operation::GetMore::Legacy do
   describe '#message' do
 
     it 'creates a get more wire protocol message with correct specs' do
-      expect(Mongo::Protocol::GetMore).to receive(:new).with(TEST_DB, TEST_COLL, to_return, cursor_id).and_call_original
+      expect(Mongo::Protocol::GetMore).to receive(:new).with(SpecConfig.instance.test_db, TEST_COLL, to_return, cursor_id).and_call_original
       begin; op.execute(authorized_primary); rescue; end
     end
   end

data/spec/mongo/operation/indexes_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Indexes do
-
   describe '#execute' do
 
     let(:index_spec) do
@@ -9,6 +8,8 @@ describe Mongo::Operation::Indexes do
     end
 
     before do
+      authorized_collection.drop
+      authorized_collection.insert_one(test: 1)
       authorized_collection.indexes.create_one(index_spec, unique: true)
     end
 
@@ -19,7 +20,7 @@ describe Mongo::Operation::Indexes do
     let(:operation) do
       described_class.new({ selector: { listIndexes: TEST_COLL },
                             coll_name: TEST_COLL,
-                            db_name: TEST_DB })
+                            db_name: SpecConfig.instance.test_db })
     end
 
     let(:indexes) do

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

@@ -1,13 +1,23 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Insert do
+  before do
+    begin
+      authorized_collection.delete_many
+    rescue Mongo::Error::OperationFailure
+    end
+    begin
+      authorized_collection.indexes.drop_all
+    rescue Mongo::Error::OperationFailure
+    end
+  end
 
   let(:documents) do
     [{ :name => 'test' }]
   end
 
   let(:write_concern) do
-    Mongo::WriteConcern.get(WRITE_CONCERN)
+    Mongo::WriteConcern.get(SpecConfig.instance.write_concern)
   end
 
   let(:spec) do
@@ -169,7 +179,7 @@ describe Mongo::Operation::Insert do
         end
 
         context 'when the insert fails' do
-    
+
           it 'aborts after first error' do
             failing_insert.bulk_execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(1)
@@ -215,7 +225,7 @@ describe Mongo::Operation::Insert do
       context 'when write concern is acknowledged' do
 
         context 'when the insert fails' do
-    
+
           it 'does not abort after first error' do
             failing_insert.bulk_execute(authorized_primary)
             expect(authorized_collection.find.count).to eq(2)

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

@@ -15,7 +15,7 @@ describe Mongo::Operation::Insert::Command do
   end
 
   let(:write_concern) do
-    Mongo::WriteConcern.get(WRITE_CONCERN)
+    Mongo::WriteConcern.get(SpecConfig.instance.write_concern)
   end
 
   let(:op) { described_class.new(spec) }
@@ -89,6 +89,7 @@ describe Mongo::Operation::Insert::Command do
   describe '#message' do
 
     context 'when the server does not support OP_MSG' do
+      max_server_version '3.4'
 
       let(:expected_selector) do
         { :documents     => documents,
@@ -98,7 +99,7 @@ describe Mongo::Operation::Insert::Command do
         }
       end
 
-      it 'creates a query wire protocol message with correct specs', unless: op_msg_enabled? do
+      it 'creates a query wire protocol message with correct specs' do
         expect(Mongo::Protocol::Query).to receive(:new).with(authorized_collection.database.name,
                                                              '$cmd',
                                                              expected_selector,

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

@@ -15,7 +15,7 @@ describe Mongo::Operation::Insert::OpMsg do
   end
 
   let(:write_concern) do
-    Mongo::WriteConcern.get(WRITE_CONCERN)
+    Mongo::WriteConcern.get(SpecConfig.instance.write_concern)
   end
 
   let(:op) { described_class.new(spec) }
@@ -88,7 +88,8 @@ describe Mongo::Operation::Insert::OpMsg do
 
   describe '#message' do
 
-    context 'when the server supports OP_MSG', if: op_msg_enabled? do
+    context 'when the server supports OP_MSG' do
+      min_server_version '3.6'
 
       let(:documents) do
         [ { foo: 1 }, { bar: 2 }]
@@ -99,7 +100,7 @@ describe Mongo::Operation::Insert::OpMsg do
             insert: TEST_COLL,
             ordered: true,
             writeConcern: write_concern.options,
-            '$db' => TEST_DB,
+            '$db' => SpecConfig.instance.test_db,
             lsid: session.session_id
         }
       end
@@ -117,7 +118,9 @@ describe Mongo::Operation::Insert::OpMsg do
         authorized_client.start_session
       end
 
-      context 'when the topology is replica set or sharded', if: test_sessions? do
+      context 'when the topology is replica set or sharded' do
+        min_server_version '3.6'
+        require_topology :replica_set, :sharded
 
         let(:expected_global_args) do
           global_args.merge(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
@@ -125,7 +128,7 @@ describe Mongo::Operation::Insert::OpMsg do
 
         it 'creates the correct OP_MSG message' do
           authorized_client.command(ping:1)
-          expect(Mongo::Protocol::Msg).to receive(:new).with([:none],
+          expect(Mongo::Protocol::Msg).to receive(:new).with([],
                                                              { validating_keys: true },
                                                              expected_global_args,
                                                              expected_payload_1)
@@ -141,7 +144,7 @@ describe Mongo::Operation::Insert::OpMsg do
 
         it 'creates the correct OP_MSG message' do
           authorized_client.command(ping:1)
-          expect(Mongo::Protocol::Msg).to receive(:new).with([:none],
+          expect(Mongo::Protocol::Msg).to receive(:new).with([],
                                                              { validating_keys: true },
                                                              expected_global_args,
                                                              expected_payload_1)
@@ -151,18 +154,22 @@ 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
 
           let(:expected_global_args) do
-            global_args.delete(:lsid)
-            global_args
+            global_args.dup.tap do |args|
+              args.delete(:lsid)
+            end
           end
 
           before do
             session.instance_variable_set(:@options, { implicit: true })
-            allow(authorized_primary.features).to receive(:sessions_enabled?).and_return(false)
+            # Topology is standalone, hence there is exactly one server
+            authorized_client.cluster.servers.first.monitor.stop!(true)
+            expect(authorized_primary.features).to receive(:sessions_enabled?).at_least(:once).and_return(false)
           end
 
           it 'creates the correct OP_MSG message' do
             authorized_client.command(ping:1)
-            expect(Mongo::Protocol::Msg).to receive(:new).with([:none],
+            expect(expected_global_args).not_to have_key(:lsid)
+            expect(Mongo::Protocol::Msg).to receive(:new).with([],
                                                                { validating_keys: true },
                                                                expected_global_args,
                                                                expected_payload_1)
@@ -184,11 +191,15 @@ describe Mongo::Operation::Insert::OpMsg do
             authorized_client.send(:get_session)
           end
 
-          context 'when the topology is replica set or sharded', if: test_sessions? do
+          context 'when the topology is replica set or sharded' do
+            min_server_version '3.6'
+            require_topology :replica_set, :sharded
 
             let(:expected_global_args) do
-              global_args.delete(:lsid)
-              global_args.merge(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
+              global_args.dup.tap do |args|
+                args.delete(:lsid)
+                args.merge!(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
+              end
             end
 
             it 'does not send a session id in the command' do
@@ -204,8 +215,9 @@ describe Mongo::Operation::Insert::OpMsg do
           context 'when the topology is standalone', if: standalone? && sessions_enabled? do
 
             let(:expected_global_args) do
-              global_args.delete(:lsid)
-              global_args
+              global_args.dup.tap do |args|
+                args.delete(:lsid)
+              end
             end
 
             it 'creates the correct OP_MSG message' do
@@ -219,15 +231,19 @@ describe Mongo::Operation::Insert::OpMsg do
           end
         end
 
-        context 'when the session is explicit', if: test_sessions? do
+        context 'when the session is explicit' do
+          min_server_version '3.6'
+          require_topology :replica_set, :sharded
 
           let(:session) do
             authorized_client.start_session
           end
 
           let(:expected_global_args) do
-            global_args.delete(:lsid)
-            global_args.merge(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
+            global_args.dup.tap do |args|
+              args.delete(:lsid)
+              args.merge!(Mongo::Operation::CLUSTER_TIME => authorized_client.cluster.cluster_time)
+            end
           end
 
           it 'does not send a session id in the command' do

data/spec/mongo/operation/insert_spec.rb

@@ -9,7 +9,7 @@ describe Mongo::Operation::Insert do
 
   let(:spec) do
     { :documents     => documents,
-      :db_name       => TEST_DB,
+      :db_name       => SpecConfig.instance.test_db,
       :coll_name     => TEST_COLL,
       :write_concern => Mongo::WriteConcern.get(:w => 1)
     }
@@ -132,7 +132,7 @@ describe Mongo::Operation::Insert do
 
         let(:spec) do
           { :documents     => documents,
-            :db_name       => TEST_DB,
+            :db_name       => SpecConfig.instance.test_db,
             :coll_name     => TEST_COLL,
             :write_concern => Mongo::WriteConcern.get(:w => 1)
           }
@@ -183,7 +183,7 @@ describe Mongo::Operation::Insert do
 
         let(:spec) do
           { :documents     => documents,
-            :db_name       => TEST_DB,
+            :db_name       => SpecConfig.instance.test_db,
             :coll_name     => TEST_COLL,
             :write_concern => Mongo::WriteConcern.get(:w => 1)
           }
@@ -209,7 +209,7 @@ describe Mongo::Operation::Insert do
 
         let(:spec) do
           { :documents     => documents,
-            :db_name       => TEST_DB,
+            :db_name       => SpecConfig.instance.test_db,
             :coll_name     => TEST_COLL,
             :write_concern => Mongo::WriteConcern.get(:w => 1)
           }
@@ -249,11 +249,12 @@ describe Mongo::Operation::Insert do
       end
     end
 
-    context 'when write concern { w: 0 } is used', unless: op_msg_enabled? do
+    context 'when write concern { w: 0 } is used' do
+      max_server_version '3.4'
 
       let(:spec) do
         { :documents     => documents,
-          :db_name       => TEST_DB,
+          :db_name       => SpecConfig.instance.test_db,
           :coll_name     => TEST_COLL,
           :write_concern => Mongo::WriteConcern.get(:w => 0)
         }

data/spec/mongo/operation/kill_cursors_spec.rb

@@ -4,7 +4,7 @@ describe Mongo::Operation::KillCursors::Legacy do
 
   let(:spec) do
     { coll_name: TEST_COLL,
-      db_name: TEST_DB,
+      db_name: SpecConfig.instance.test_db,
       :cursor_ids => [1,2]
     }
   end
@@ -34,7 +34,7 @@ describe Mongo::Operation::KillCursors::Legacy do
   describe '#message' do
 
     it 'creates a kill cursors wire protocol message with correct specs' do
-      expect(Mongo::Protocol::KillCursors).to receive(:new).with(TEST_COLL, TEST_DB, spec[:cursor_ids])
+      expect(Mongo::Protocol::KillCursors).to receive(:new).with(TEST_COLL, SpecConfig.instance.test_db, spec[:cursor_ids])
       op.send(:message, double('server'))
     end
   end

data/spec/mongo/operation/map_reduce_spec.rb

@@ -36,7 +36,7 @@ describe Mongo::Operation::MapReduce do
   let(:spec) do
     { :selector => selector,
       :options  => options,
-      :db_name  => TEST_DB
+      :db_name  => SpecConfig.instance.test_db
     }
   end
 
@@ -66,7 +66,7 @@ describe Mongo::Operation::MapReduce do
       let(:other_spec) do
         { :selector => other_selector,
           :options => {},
-          :db_name => TEST_DB,
+          :db_name => SpecConfig.instance.test_db,
         }
       end
       let(:other) { described_class.new(other_spec) }