mongo 2.11.2 → 2.13.0.beta1

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

@@ -10,8 +10,12 @@ describe Mongo::Collection::View::Writable do
     {}
   end
 
+  let(:view_collection) do
+    authorized_collection
+  end
+
   let(:view) do
-    Mongo::Collection::View.new(authorized_collection, selector, options)
+    Mongo::Collection::View.new(view_collection, selector, options)
   end
 
   before do
@@ -24,6 +28,32 @@ describe Mongo::Collection::View::Writable do
       authorized_collection.insert_many([{ field: 'test1' }])
     end
 
+    context 'when hint option is provided' do
+      # Functionality on more recent servers is sufficiently covered by spec tests.
+      context 'on server versions < 4.2' do
+        max_server_fcv '4.0'
+
+        it 'raises a client-side exception' do
+          expect do
+            view.find_one_and_delete(hint: '_id_')
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The MongoDB server handling this request does not support the hint option on this command./)
+        end
+      end
+
+      context 'when the write concern is unacknowledged' do
+        let(:view_collection) do
+          client = authorized_client.with(write_concern: { w: 0 })
+          client[authorized_collection.name]
+        end
+
+        it 'raises a client-side error' do
+          expect do
+            view.find_one_and_delete(hint: '_id_')
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+        end
+      end
+    end
+
     context 'when a matching document is found' do
 
       let(:selector) do
@@ -218,6 +248,32 @@ describe Mongo::Collection::View::Writable do
       authorized_collection.insert_many([{ field: 'test1', other: 'sth' }])
     end
 
+    context 'when hint option is provided' do
+      # Functionality on more recent servers is sufficiently covered by spec tests.
+      context 'on server versions < 4.2' do
+        max_server_fcv '4.0'
+
+        it 'raises a client-side exception' do
+          expect do
+            view.find_one_and_replace({ field: 'testing' }, { hint: '_id_' })
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The MongoDB server handling this request does not support the hint option on this command./)
+        end
+      end
+
+      context 'when the write concern is unacknowledged' do
+        let(:view_collection) do
+          client = authorized_client.with(write_concern: { w: 0 })
+          client[authorized_collection.name]
+        end
+
+        it 'raises a client-side error' do
+          expect do
+            view.find_one_and_replace({ field: 'testing' }, { hint: '_id_' })
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+        end
+      end
+    end
+
     context 'when a matching document is found' do
 
       let(:selector) do
@@ -435,6 +491,32 @@ describe Mongo::Collection::View::Writable do
       authorized_collection.insert_many([{ field: 'test1' }])
     end
 
+    context 'when hint option is provided' do
+      # Functionality on more recent servers is sufficiently covered by spec tests.
+      context 'on server versions < 4.2' do
+        max_server_fcv '4.0'
+
+        it 'raises a client-side exception' do
+          expect do
+            view.find_one_and_update({ '$set' => { field: 'testing' } }, { hint: '_id_' })
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The MongoDB server handling this request does not support the hint option on this command./)
+        end
+      end
+
+      context 'when the write concern is unacknowledged' do
+        let(:view_collection) do
+          client = authorized_client.with(write_concern: { w: 0 })
+          client[authorized_collection.name]
+        end
+
+        it 'raises a client-side error' do
+          expect do
+            view.find_one_and_update({ '$set' => { field: 'testing' } }, { hint: '_id_' })
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+        end
+      end
+    end
+
     context 'when a matching document is found' do
 
       let(:selector) do
@@ -625,6 +707,31 @@ describe Mongo::Collection::View::Writable do
   end
 
   describe '#delete_many' do
+    context 'when a hint option is provided' do
+      # Functionality on more recent servers is sufficiently covered by spec tests.
+      context 'on server versions < 3.4' do
+        max_server_fcv '3.2'
+
+        it 'raises a client-side exception' do
+          expect do
+            view.delete_many(hint: '_id_')
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The MongoDB server handling this request does not support the hint option on this command./)
+        end
+      end
+
+      context 'when the write concern is unacknowledged' do
+        let(:view_collection) do
+          client = authorized_client.with(write_concern: { w: 0 })
+          client[authorized_collection.name]
+        end
+
+        it 'raises a client-side error' do
+          expect do
+            view.delete_many(hint: '_id_')
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+        end
+      end
+    end
 
     context 'when a selector was provided' do
 
@@ -787,6 +894,31 @@ describe Mongo::Collection::View::Writable do
   end
 
   describe '#delete_one' do
+    context 'when a hint option is provided' do
+      # Functionality on more recent servers is sufficiently covered by spec tests.
+      context 'on server versions < 3.4' do
+        max_server_fcv '3.2'
+
+        it 'raises a client-side exception' do
+          expect do
+            view.delete_one(hint: '_id_')
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The MongoDB server handling this request does not support the hint option on this command./)
+        end
+      end
+
+      context 'when the write concern is unacknowledged' do
+        let(:view_collection) do
+          client = authorized_client.with(write_concern: { w: 0 })
+          client[authorized_collection.name]
+        end
+
+        it 'raises a client-side error' do
+          expect do
+            view.delete_many(hint: '_id_')
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+        end
+      end
+    end
 
     context 'when a selector was provided' do
 
@@ -950,6 +1082,31 @@ describe Mongo::Collection::View::Writable do
   end
 
   describe '#replace_one' do
+    context 'when a hint option is provided' do
+      # Functionality on more recent servers is sufficiently covered by spec tests.
+      context 'on server versions < 3.4' do
+        max_server_fcv '3.2'
+
+        it 'raises a client-side exception' do
+          expect do
+            view.replace_one({ field: 'testing' }, { hint: '_id_' })
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The MongoDB server handling this request does not support the hint option on this command./)
+        end
+      end
+
+      context 'when the write concern is unacknowledged' do
+        let(:view_collection) do
+          client = authorized_client.with(write_concern: { w: 0 })
+          client[authorized_collection.name]
+        end
+
+        it 'raises a client-side error' do
+          expect do
+            view.delete_many(hint: '_id_')
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+        end
+      end
+    end
 
     context 'when a selector was provided' do
 
@@ -1182,6 +1339,31 @@ describe Mongo::Collection::View::Writable do
   end
 
   describe '#update_many' do
+    context 'when a hint option is provided' do
+      # Functionality on more recent servers is sufficiently covered by spec tests.
+      context 'on server versions < 3.4' do
+        max_server_fcv '3.2'
+
+        it 'raises a client-side exception' do
+          expect do
+            view.update_many({ '$set' => { field: 'testing' } }, { hint: '_id_' })
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The MongoDB server handling this request does not support the hint option on this command./)
+        end
+      end
+
+      context 'when the write concern is unacknowledged' do
+        let(:view_collection) do
+          client = authorized_client.with(write_concern: { w: 0 })
+          client[authorized_collection.name]
+        end
+
+        it 'raises a client-side error' do
+          expect do
+            view.delete_many(hint: '_id_')
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+        end
+      end
+    end
 
     context 'when a selector was provided' do
 
@@ -1420,6 +1602,31 @@ describe Mongo::Collection::View::Writable do
   end
 
   describe '#update_one' do
+    context 'when a hint option is provided' do
+      # Functionality on more recent servers is sufficiently covered by spec tests.
+      context 'on server versions < 3.4' do
+        max_server_fcv '3.2'
+
+        it 'raises a client-side exception' do
+          expect do
+            view.update_one({ '$set' => { field: 'testing' } }, { hint: '_id_' })
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The MongoDB server handling this request does not support the hint option on this command./)
+        end
+      end
+
+      context 'when the write concern is unacknowledged' do
+        let(:view_collection) do
+          client = authorized_client.with(write_concern: { w: 0 })
+          client[authorized_collection.name]
+        end
+
+        it 'raises a client-side error' do
+          expect do
+            view.update_one({ '$set' => { field: 'testing' } }, { hint: '_id_' })
+          end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+        end
+      end
+    end
 
     context 'when a selector was provided' do
 

data/spec/mongo/collection/view_spec.rb

@@ -147,7 +147,7 @@ describe Mongo::Collection::View do
       end
 
       it 'sends a kill cursors command for the cursor' do
-        expect(cursor).to receive(:kill_cursors).and_call_original
+        expect(cursor).to receive(:close).and_call_original
         view.close_query
       end
     end

data/spec/mongo/collection_spec.rb

@@ -2,8 +2,18 @@ require 'spec_helper'
 
 describe Mongo::Collection do
 
+  let(:subscriber) { EventSubscriber.new }
+
+  let(:client) do
+    authorized_client.tap do |client|
+      client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+    end
+  end
+
+  let(:authorized_collection) { client['collection_spec'] }
+
   before do
-    authorized_collection.drop
+    authorized_client['collection_spec'].drop
   end
 
   let(:collection_invalid_write_concern) do
@@ -14,10 +24,6 @@ describe Mongo::Collection do
     authorized_client[:validating]
   end
 
-  let(:client) do
-    authorized_client
-  end
-
   describe '#==' do
 
     let(:database) do
@@ -203,11 +209,11 @@ describe Mongo::Collection do
     end
 
     let(:database) do
-      Mongo::Database.new(client, :test)
+      Mongo::Database.new(client, SpecConfig.instance.test_db)
     end
 
     let(:collection) do
-      database.collection(:users)
+      database.collection('test-collection')
     end
 
     let(:new_collection) do
@@ -241,14 +247,12 @@ describe Mongo::Collection do
       end
 
       context 'when the client has a read preference set' do
-        clean_slate_on_evergreen
 
         let(:client) do
-          authorized_client.with(SpecConfig.instance.auth_options.merge(
-            client_options
-          )).tap do |client|
+          authorized_client.with(client_options).tap do |client|
             expect(client.options[:read]).to eq(Mongo::Options::Redacted.new(
               mode: :primary_preferred))
+            client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
           end
         end
 
@@ -278,15 +282,7 @@ describe Mongo::Collection do
           require_topology :replica_set
 
           let(:client_options) do
-            {
-              read: { mode: :primary_preferred },
-            }
-          end
-
-          let(:subscriber) { EventSubscriber.new }
-
-          before do
-            client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+            {read: { mode: :primary_preferred }}
           end
 
           shared_examples_for "uses collection's read preference when reading" do
@@ -1211,10 +1207,6 @@ describe Mongo::Collection do
           { session: session }
         end
 
-        let(:client) do
-          subscribed_client
-        end
-
         let(:session) do
           client.start_session
         end
@@ -1225,7 +1217,7 @@ describe Mongo::Collection do
 
         let(:command) do
           client[TEST_COLL].find({}, session: session).explain
-          EventSubscriber.started_events.find { |c| c.command_name == 'explain' }.command
+          subscriber.started_events.find { |c| c.command_name == 'explain' }.command
         end
 
         it 'sends the session id' do
@@ -1242,7 +1234,7 @@ describe Mongo::Collection do
 
         let(:command) do
           operation
-          EventSubscriber.started_events.find { |cmd| cmd.command_name == 'find' }.command
+          subscriber.started_events.find { |cmd| cmd.command_name == 'find' }.command
         end
 
         it_behaves_like 'an operation supporting causally consistent reads'
@@ -1442,7 +1434,7 @@ describe Mongo::Collection do
     context 'when unacknowledged writes is used with an implicit session' do
 
       let(:collection_with_unacknowledged_write_concern) do
-        subscribed_client.with(write: { w: 0 })[TEST_COLL]
+        client.with(write: { w: 0 })[TEST_COLL]
       end
 
       let(:operation) do
@@ -1524,20 +1516,16 @@ describe Mongo::Collection do
     context 'when the documents are sent with OP_MSG' do
       min_server_fcv '3.6'
 
-      let(:client) do
-        subscribed_client
-      end
-
       let(:documents) do
         [{ '_id' => 1, 'name' => '1'*16777191 }, { '_id' => 'y' }]
       end
 
       before do
-        client[TEST_COLL].insert_many(documents)
+        authorized_collection.insert_many(documents)
       end
 
       let(:insert_events) do
-        EventSubscriber.started_events.select { |e| e.command_name == 'insert' }
+        subscriber.started_events.select { |e| e.command_name == 'insert' }
       end
 
       it 'sends the documents in one OP_MSG' do
@@ -1685,7 +1673,7 @@ describe Mongo::Collection do
     context 'when unacknowledged writes is used with an implicit session' do
 
       let(:collection_with_unacknowledged_write_concern) do
-        subscribed_client.with(write: { w: 0 })[TEST_COLL]
+        client.with(write: { w: 0 })[TEST_COLL]
       end
 
       let(:operation) do
@@ -1895,7 +1883,7 @@ describe Mongo::Collection do
 
       let(:command) do
         operation
-        EventSubscriber.started_events.find { |cmd| cmd.command_name == 'aggregate' }.command
+        subscriber.started_events.find { |cmd| cmd.command_name == 'aggregate' }.command
       end
 
       it_behaves_like 'an operation supporting causally consistent reads'
@@ -2100,7 +2088,7 @@ describe Mongo::Collection do
 
         let(:command) do
           operation
-          EventSubscriber.started_events.find { |cmd| cmd.command_name == 'count' }.command
+          subscriber.started_events.find { |cmd| cmd.command_name == 'count' }.command
         end
 
         it_behaves_like 'an operation supporting causally consistent reads'
@@ -2218,7 +2206,7 @@ describe Mongo::Collection do
 
       let(:command) do
         operation
-        EventSubscriber.started_events.find { |cmd| cmd.command_name == 'distinct' }.command
+        subscriber.started_events.find { |cmd| cmd.command_name == 'distinct' }.command
       end
 
       it_behaves_like 'an operation supporting causally consistent reads'
@@ -2380,7 +2368,7 @@ describe Mongo::Collection do
     context 'when unacknowledged writes is used with an implicit session' do
 
       let(:collection_with_unacknowledged_write_concern) do
-        subscribed_client.with(write: { w: 0 })[TEST_COLL]
+        client.with(write: { w: 0 })[TEST_COLL]
       end
 
       let(:operation) do
@@ -2552,7 +2540,7 @@ describe Mongo::Collection do
       it_behaves_like 'a failed operation using a session'
     end
 
-    context 'when unacknowledged writes is used with an explicit session' do
+    context 'when unacknowledged writes are used with an explicit session' do
 
       let(:collection_with_unacknowledged_write_concern) do
         authorized_collection.with(write: { w: 0 })
@@ -2565,10 +2553,10 @@ describe Mongo::Collection do
       it_behaves_like 'an explicit session with an unacknowledged write'
     end
 
-    context 'when unacknowledged writes is used with an implicit session' do
+    context 'when unacknowledged writes are used with an implicit session' do
 
       let(:collection_with_unacknowledged_write_concern) do
-        subscribed_client.with(write: { w: 0 })[TEST_COLL]
+        client.with(write: { w: 0 })[TEST_COLL]
       end
 
       let(:operation) do
@@ -2736,7 +2724,6 @@ describe Mongo::Collection do
     end
 
     context 'when a session is not provided' do
-      let(:client) { subscribed_client }
       let(:collection) { client['test'] }
 
       let(:cursors) do
@@ -2753,7 +2740,7 @@ describe Mongo::Collection do
 
       let(:command) do
         operation
-        event = EventSubscriber.started_events.find { |cmd| cmd.command_name == 'parallelCollectionScan' }
+        event = subscriber.started_events.find { |cmd| cmd.command_name == 'parallelCollectionScan' }
         expect(event).not_to be_nil
         event.command
       end
@@ -2775,7 +2762,7 @@ describe Mongo::Collection do
 
       let(:command) do
         operation
-        event = EventSubscriber.started_events.find { |cmd| cmd.command_name == 'parallelCollectionScan' }
+        event = subscriber.started_events.find { |cmd| cmd.command_name == 'parallelCollectionScan' }
         expect(event).not_to be_nil
         event.command
       end
@@ -3178,7 +3165,7 @@ describe Mongo::Collection do
     context 'when unacknowledged writes is used with an implicit session' do
 
       let(:collection_with_unacknowledged_write_concern) do
-        subscribed_client.with(write: { w: 0 })[TEST_COLL]
+        client.with(write: { w: 0 })[TEST_COLL]
       end
 
       let(:operation) do
@@ -3600,7 +3587,7 @@ describe Mongo::Collection do
     context 'when unacknowledged writes is used with an implicit session' do
 
       let(:collection_with_unacknowledged_write_concern) do
-        subscribed_client.with(write: { w: 0 })[TEST_COLL]
+        client.with(write: { w: 0 })[TEST_COLL]
       end
 
       let(:operation) do
@@ -3958,10 +3945,6 @@ describe Mongo::Collection do
     context 'when the documents are sent with OP_MSG' do
       min_server_fcv '3.6'
 
-      let(:client) do
-        subscribed_client
-      end
-
       let(:documents) do
         [{ '_id' => 1, 'name' => '1'*16777191 }, { '_id' => 'y' }]
       end
@@ -3972,7 +3955,7 @@ describe Mongo::Collection do
       end
 
       let(:update_events) do
-        EventSubscriber.started_events.select { |e| e.command_name == 'update' }
+        subscriber.started_events.select { |e| e.command_name == 'update' }
       end
 
       it 'sends the documents in one OP_MSG' do
@@ -4022,7 +4005,7 @@ describe Mongo::Collection do
     context 'when unacknowledged writes is used with an implicit session' do
 
       let(:collection_with_unacknowledged_write_concern) do
-        subscribed_client.with(write: { w: 0 })[TEST_COLL]
+        client.with(write: { w: 0 })[TEST_COLL]
       end
 
       let(:operation) do