mongo 2.6.4 → 2.7.0.rc0

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

@@ -30,7 +30,7 @@ describe Mongo::Collection::View::Aggregation do
     aggregation.send(:aggregate_spec, double('session'))
   end
 
-  after do
+  before do
     authorized_collection.delete_many
   end
 
@@ -65,11 +65,8 @@ describe Mongo::Collection::View::Aggregation do
     end
 
     before do
-      authorized_collection.insert_many(documents)
-    end
-
-    after do
       authorized_collection.delete_many
+      authorized_collection.insert_many(documents)
     end
 
     context 'when provided a session' do
@@ -225,7 +222,9 @@ describe Mongo::Collection::View::Aggregation do
       expect(aggregation.explain).to_not be_empty
     end
 
-    context 'session id', if: test_sessions? do
+    context 'session id' do
+      min_server_version '3.6'
+      require_topology :replica_set, :sharded
 
       let(:options) do
         { session: session }
@@ -325,7 +324,7 @@ describe Mongo::Collection::View::Aggregation do
     context 'when the collection has a read preference' do
 
       let(:read_preference) do
-        Mongo::ServerSelector.get(mode: :secondary)
+        {mode: :secondary}
       end
 
       it 'includes the read preference in the spec' do
@@ -553,7 +552,7 @@ describe Mongo::Collection::View::Aggregation do
       ]
     end
 
-    after do
+    before do
       authorized_client['output_collection'].delete_many
     end
 

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

@@ -19,7 +19,7 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
   end
 
   let(:change_stream) do
-    described_class.new(view, pipeline, nil, options)
+    @change_stream = described_class.new(view, pipeline, nil, options)
   end
 
   let(:change_stream_document) do
@@ -53,12 +53,20 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
       change_stream
     rescue => e
       e
+    else
+      nil
     end
   end
 
-  after do
+  before do
     authorized_collection.delete_many
-    begin; change_stream.close; rescue; end
+  end
+
+  after do
+    # Only close the change stream if one was successfully created by the test
+    if @change_stream
+      @change_stream.close
+    end
   end
 
   describe '#initialize' do
@@ -316,7 +324,7 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
       context 'when a session from another client is provided' do
 
         let(:session) do
-          authorized_client_with_retry_writes.start_session
+          another_authorized_client.start_session
         end
 
         let(:operation_result) do
@@ -419,6 +427,8 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
   context 'when the first response does not contain the resume token' do
 
     let(:pipeline) do
+      # This removes id from change stream document which is used as
+      # resume token
       [{ '$project' => { _id: 0 } }]
     end
 
@@ -535,8 +545,7 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
       end
 
       before do
-        #expect twice because of kill_cursors in after block
-        expect(view.send(:server_selector)).to receive(:select_server).twice.and_call_original
+        expect(view.send(:server_selector)).to receive(:select_server).and_call_original
       end
 
       it_behaves_like 'a non-resumed change stream'
@@ -685,7 +694,9 @@ describe Mongo::Collection::View::ChangeStream, if: test_change_streams? do
         end
 
         before do
-          begin; enum.next; rescue; end
+          expect do
+            enum.next
+          end.to raise_error(Mongo::Error::MissingResumeToken)
         end
 
         it 'does not close the session' do

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

@@ -14,7 +14,7 @@ describe Mongo::Collection::View::Explainable do
     Mongo::Collection::View.new(authorized_collection, selector, options)
   end
 
-  after do
+  before do
     authorized_collection.delete_many
   end
 

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

@@ -14,7 +14,7 @@ describe Mongo::Collection::View::Immutable do
     Mongo::Collection::View.new(authorized_collection, selector, options)
   end
 
-  after do
+  before do
     authorized_collection.delete_many
   end
 

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

@@ -48,11 +48,8 @@ describe Mongo::Collection::View::MapReduce do
   end
 
   before do
-    authorized_collection.insert_many(documents)
-  end
-
-  after do
     authorized_collection.delete_many
+    authorized_collection.insert_many(documents)
   end
 
   let(:map_reduce) do
@@ -127,7 +124,7 @@ describe Mongo::Collection::View::MapReduce do
 
     context 'when out is in the options' do
 
-      after do
+      before do
         authorized_client['output_collection'].delete_many
       end
 
@@ -173,7 +170,7 @@ describe Mongo::Collection::View::MapReduce do
 
     context 'when out is a collection' do
 
-      after do
+      before do
         authorized_client['output_collection'].delete_many
       end
 
@@ -226,6 +223,8 @@ describe Mongo::Collection::View::MapReduce do
         end
 
         context 'when the output collection is iterated' do
+          min_server_version '3.6'
+          require_topology :replica_set, :sharded
 
           let(:options) do
             { session: session }
@@ -252,7 +251,7 @@ describe Mongo::Collection::View::MapReduce do
             begin; client.use('another-db')[TEST_COLL].create; rescue; end
           end
 
-          it 'uses the session when iterating over the output collection', if: test_sessions? do
+          it 'uses the session when iterating over the output collection' do
             new_map_reduce.to_a
             expect(find_command["lsid"]).to eq(BSON::Document.new(session.session_id))
           end
@@ -715,7 +714,7 @@ describe Mongo::Collection::View::MapReduce do
   context 'when the collection has a read preference' do
 
     let(:read_preference) do
-      Mongo::ServerSelector.get(mode: :secondary)
+      {mode: :secondary}
     end
 
     it 'includes the read preference in the spec' do

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

@@ -14,7 +14,7 @@ describe Mongo::Collection::View::Readable do
     Mongo::Collection::View.new(authorized_collection, selector, options)
   end
 
-  after do
+  before do
     authorized_collection.delete_many
   end
 
@@ -282,11 +282,8 @@ describe Mongo::Collection::View::Readable do
     end
 
     before do
-      authorized_collection.insert_many(documents)
-    end
-
-    after do
       authorized_collection.delete_many
+      authorized_collection.insert_many(documents)
     end
 
     let(:result) do
@@ -325,7 +322,9 @@ describe Mongo::Collection::View::Readable do
     end
 
     it 'takes a read preference option', unless: sharded? do
-      expect(view.count(read: { mode: :secondary })).to eq(10)
+      # Secondary may be delayed, since this tests wants 10 documents
+      # it must query the primary
+      expect(view.count(read: { mode: :primary })).to eq(10)
     end
 
     context 'when a read preference is set on the view', unless: sharded? do
@@ -1176,11 +1175,11 @@ describe Mongo::Collection::View::Readable do
     context 'when a read pref is not specified' do
 
       let(:options) do
-        { :read =>  Mongo::ServerSelector.get(:mode => :secondary) }
+        { :read =>  {:mode => :secondary} }
       end
 
       it 'returns the read preference' do
-        expect(view.read).to eq(options[:read])
+        expect(view.read).to eq(BSON::Document.new(options[:read]))
       end
 
       context 'when no read pref is set on initialization' do

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

@@ -14,7 +14,7 @@ describe Mongo::Collection::View::Writable do
     Mongo::Collection::View.new(authorized_collection, selector, options)
   end
 
-  after do
+  before do
     authorized_collection.delete_many
   end
 

data/spec/mongo/collection/view_spec.rb

@@ -14,7 +14,7 @@ describe Mongo::Collection::View do
     described_class.new(authorized_collection, filter, options)
   end
 
-  after do
+  before do
     authorized_collection.delete_many
   end
 
@@ -112,11 +112,8 @@ describe Mongo::Collection::View do
     end
 
     before do
-      authorized_collection.insert_many(documents)
-    end
-
-    after do
       authorized_collection.delete_many
+      authorized_collection.insert_many(documents)
     end
 
     context 'when a block is not provided' do

data/spec/mongo/collection_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Mongo::Collection do
 
-  after do
-    authorized_collection.delete_many
+  before do
+    authorized_collection.drop
   end
 
   let(:collection_invalid_write_concern) do
@@ -101,7 +101,7 @@ describe Mongo::Collection do
   describe '#with' do
 
     let(:client) do
-      Mongo::Client.new(SpecConfig.instance.addresses, TEST_OPTIONS)
+      new_local_client(SpecConfig.instance.addresses, SpecConfig.instance.test_options)
     end
 
     let(:database) do
@@ -133,7 +133,7 @@ describe Mongo::Collection do
       context 'when the client has a server selection timeout setting' do
 
         let(:client) do
-          Mongo::Client.new(SpecConfig.instance.addresses, TEST_OPTIONS.merge(server_selection_timeout: 2))
+          new_local_client(SpecConfig.instance.addresses, SpecConfig.instance.test_options.merge(server_selection_timeout: 2))
         end
 
         it 'passes the the server_selection_timeout to the cluster' do
@@ -144,7 +144,7 @@ describe Mongo::Collection do
       context 'when the client has a read preference set' do
 
         let(:client) do
-          Mongo::Client.new(SpecConfig.instance.addresses, TEST_OPTIONS.merge(read: { mode: :primary_preferred }))
+          new_local_client(SpecConfig.instance.addresses, SpecConfig.instance.test_options.merge(read: { mode: :primary_preferred }))
         end
 
         it 'sets the new read options on the new collection' do
@@ -156,7 +156,7 @@ describe Mongo::Collection do
       context 'when the client has a read preference and server selection timeout set' do
 
         let(:client) do
-          Mongo::Client.new(SpecConfig.instance.addresses, TEST_OPTIONS.merge(read: { mode: :primary_preferred }, server_selection_timeout: 2))
+          new_local_client(SpecConfig.instance.addresses, SpecConfig.instance.test_options.merge(read: { mode: :primary_preferred }, server_selection_timeout: 2))
         end
 
         it 'sets the new read options on the new collection' do
@@ -186,7 +186,7 @@ describe Mongo::Collection do
       context 'when the client has a write concern set' do
 
         let(:client) do
-          Mongo::Client.new(SpecConfig.instance.addresses, TEST_OPTIONS.merge(write: INVALID_WRITE_CONCERN))
+          new_local_client(SpecConfig.instance.addresses, SpecConfig.instance.test_options.merge(write: INVALID_WRITE_CONCERN))
         end
 
         it 'sets the new write options on the new collection' do
@@ -219,7 +219,7 @@ describe Mongo::Collection do
       context 'when the client has a server selection timeout setting' do
 
         let(:client) do
-          Mongo::Client.new(SpecConfig.instance.addresses, TEST_OPTIONS.merge(server_selection_timeout: 2))
+          new_local_client(SpecConfig.instance.addresses, SpecConfig.instance.test_options.merge(server_selection_timeout: 2))
         end
 
         it 'passes the server_selection_timeout setting to the cluster' do
@@ -230,7 +230,7 @@ describe Mongo::Collection do
       context 'when the client has a read preference set' do
 
         let(:client) do
-          Mongo::Client.new(SpecConfig.instance.addresses, TEST_OPTIONS.merge(read: { mode: :primary_preferred }))
+          new_local_client(SpecConfig.instance.addresses, SpecConfig.instance.test_options.merge(read: { mode: :primary_preferred }))
         end
 
         it 'sets the new read options on the new collection' do
@@ -357,13 +357,10 @@ describe Mongo::Collection do
       end
 
       before do
+        authorized_client[:specs].drop
         collection.create
       end
 
-      after do
-        collection.drop
-      end
-
       it 'returns true' do
         expect(collection).to be_capped
       end
@@ -376,13 +373,10 @@ describe Mongo::Collection do
       end
 
       before do
+        authorized_client[:specs].drop
         collection.create
       end
 
-      after do
-        collection.drop
-      end
-
       it 'returns false' do
         expect(collection).to_not be_capped
       end
@@ -390,6 +384,9 @@ describe Mongo::Collection do
   end
 
   describe '#create' do
+    before do
+      authorized_client[:specs].drop
+    end
 
     let(:database) do
       authorized_client.database
@@ -405,10 +402,6 @@ describe Mongo::Collection do
         collection.create
       end
 
-      after do
-        collection.drop
-      end
-
       it 'executes the command' do
         expect(response).to be_successful
       end
@@ -432,10 +425,6 @@ describe Mongo::Collection do
             { :capped => true, :size => 1024 }
           end
 
-          after do
-            collection.drop
-          end
-
           it 'executes the command' do
             expect(response).to be_successful
           end
@@ -464,10 +453,6 @@ describe Mongo::Collection do
             database.list_collections.find { |i| i['name'] == 'specs' }
           end
 
-          after do
-            collection.drop
-          end
-
           it 'executes the command' do
             expect(response).to be_successful
           end
@@ -512,7 +497,7 @@ describe Mongo::Collection do
 
       context 'when the collection has a write concern' do
 
-        after do
+        before do
           database[:specs].drop
         end
 
@@ -559,7 +544,7 @@ describe Mongo::Collection do
             database.list_collections.find { |i| i['name'] == 'specs' }
           end
 
-          after do
+          before do
             collection.drop
           end
 
@@ -644,7 +629,7 @@ describe Mongo::Collection do
           authorized_client[:specs, invalid: true].create(session: session)
         end
 
-        after do
+        before do
           collection.drop
         end
 
@@ -667,7 +652,10 @@ describe Mongo::Collection do
     context 'when the collection exists' do
 
       before do
+        authorized_client[:specs].drop
         collection.create
+        # wait for the collection to be created
+        sleep 0.4
       end
 
       context 'when a session is provided' do
@@ -688,10 +676,6 @@ describe Mongo::Collection do
           authorized_client
         end
 
-        after do
-          collection.drop
-        end
-
         it_behaves_like 'an operation using a session'
 
         # Due to how rspec interprets nested `if: condition` guards, we can't use one to skip this
@@ -734,10 +718,6 @@ describe Mongo::Collection do
           collection.with(write_options)
         end
 
-        after do
-          collection.drop
-        end
-
         context 'when the server supports write concern on the drop command', if: collation_enabled? && can_set_write_concern? do
 
           it 'applies the write concern' do
@@ -757,6 +737,12 @@ describe Mongo::Collection do
     end
 
     context 'when the collection does not exist', if: can_set_write_concern? do
+      before do
+        begin
+          collection.drop
+        rescue Mongo::Error::OperationFailure
+        end
+      end
 
       it 'returns false' do
         expect(collection.drop).to be(false)
@@ -899,7 +885,9 @@ describe Mongo::Collection do
         it_behaves_like 'a failed operation using a session'
       end
 
-      context 'session id', if: test_sessions? do
+      context 'session id' do
+        min_server_version '3.6'
+        require_topology :replica_set, :sharded
 
         let(:options) do
           { session: session }
@@ -1173,11 +1161,13 @@ describe Mongo::Collection do
       end
 
       let(:custom_collection) do
-        custom_client[TEST_COLL]
+        custom_client['custom_id_generator_test_collection']
       end
 
       before do
+        custom_collection.delete_many
         custom_collection.insert_many([{ name: 'testing' }])
+        expect(custom_collection.count).to eq(1)
       end
 
       after do
@@ -1185,6 +1175,7 @@ describe Mongo::Collection do
       end
 
       it 'inserts with the custom id' do
+        expect(custom_collection.count).to eq(1)
         expect(custom_collection.find.first[:_id]).to eq(1)
       end
     end
@@ -1215,7 +1206,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the documents are sent with OP_MSG', if: op_msg_enabled? do
+    context 'when the documents are sent with OP_MSG' do
+      min_server_version '3.6'
 
       let(:client) do
         subscribed_client
@@ -1247,6 +1239,7 @@ describe Mongo::Collection do
       min_server_version '3.2'
 
       around(:each) do |spec|
+        authorized_client[:validating].drop
         authorized_client[:validating,
                           :validator => { :a => { '$exists' => true } }].tap do |c|
           c.create
@@ -1437,6 +1430,7 @@ describe Mongo::Collection do
       end
 
       before do
+        custom_collection.delete_many
         custom_collection.insert_one({ name: 'testing' })
       end
 
@@ -1529,10 +1523,6 @@ describe Mongo::Collection do
       authorized_collection.indexes.create_one(index_spec, unique: true)
     end
 
-    after do
-      authorized_collection.indexes.drop_one('name_1')
-    end
-
     it 'returns a list of indexes' do
       expect(index_names).to include(*'name_1', '_id_')
     end
@@ -3591,7 +3581,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the documents are sent with OP_MSG', if: op_msg_enabled? do
+    context 'when the documents are sent with OP_MSG' do
+      min_server_version '3.6'
 
       let(:client) do
         subscribed_client
@@ -4064,6 +4055,7 @@ describe Mongo::Collection do
       min_server_version '3.2'
 
       around(:each) do |spec|
+        authorized_client[:validating].drop
         authorized_client[:validating,
                           :validator => { :a => { '$exists' => true } }].tap do |c|
           c.create
@@ -4452,6 +4444,7 @@ describe Mongo::Collection do
       min_server_version '3.2'
 
       around(:each) do |spec|
+        authorized_client[:validating].drop
         authorized_client[:validating,
                           :validator => { :a => { '$exists' => true } }].tap do |c|
           c.create