mongo 2.15.0 → 2.18.1

data/spec/mongo/database_spec.rb

@@ -18,6 +18,14 @@ describe Mongo::Database do
     end
   end
 
+  let(:subscriber) { Mrss::EventSubscriber.new }
+
+  let(:monitored_client) do
+    root_authorized_client.tap do |client|
+      client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+    end
+  end
+
   describe '#==' do
 
     let(:database) do
@@ -218,7 +226,7 @@ describe Mongo::Database do
           described_class.new(client, SpecConfig.instance.test_db)
         end
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           authorized_client.tap do |client|
@@ -278,6 +286,18 @@ describe Mongo::Database do
         collection_names.should include('coll-119')
       end
     end
+
+    context 'with comment' do
+      min_server_version '4.4'
+
+      it 'returns collection names and send comment' do
+        database = described_class.new(monitored_client, SpecConfig.instance.test_db)
+        database.collection_names(comment: "comment")
+        command = subscriber.command_started_events("listCollections").last&.command
+        expect(command).not_to be_nil
+        expect(command["comment"]).to eq("comment")
+      end
+    end
   end
 
   describe '#list_collections' do
@@ -391,7 +411,7 @@ describe Mongo::Database do
           described_class.new(client, SpecConfig.instance.test_db)
         end
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           authorized_client.tap do |client|
@@ -479,6 +499,18 @@ describe Mongo::Database do
         collection_names.should include('coll-119')
       end
     end
+
+    context 'with comment' do
+      min_server_version '4.4'
+
+      it 'returns collection names and send comment' do
+        database = described_class.new(monitored_client, SpecConfig.instance.test_db)
+        database.list_collections(comment: "comment")
+        command = subscriber.command_started_events("listCollections").last&.command
+        expect(command).not_to be_nil
+        expect(command["comment"]).to eq("comment")
+      end
+    end
   end
 
   describe '#collections' do
@@ -583,7 +615,7 @@ describe Mongo::Database do
           described_class.new(client, SpecConfig.instance.test_db)
         end
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           authorized_client.tap do |client|
@@ -591,7 +623,7 @@ describe Mongo::Database do
           end
         end
 
-        context 'when authorized_collections are provided' do
+        context 'when authorized_collections are provided as false' do
           let(:options) do
             { authorized_collections: false }
           end
@@ -612,6 +644,27 @@ describe Mongo::Database do
           end
         end
 
+        context 'when authorized_collections are provided as true' do
+          let(:options) do
+            { authorized_collections: true }
+          end
+
+          let!(:result) do
+            database.collections(options)
+          end
+
+          let(:events) do
+            subscriber.command_started_events('listCollections')
+          end
+
+          it 'authorized_collections not passed to server because false' do
+            expect(events.length).to eq(1)
+            command = events.first.command
+            expect(command['nameOnly']).to eq(true)
+            expect(command['authorizedCollections']).to eq(true)
+          end
+        end
+
         context 'when no options are provided' do
           let!(:result) do
             database.collections
@@ -647,6 +700,18 @@ describe Mongo::Database do
         collection_names.should include('coll-119')
       end
     end
+
+    context 'with comment' do
+      min_server_version '4.4'
+
+      it 'returns collection names and send comment' do
+        database = described_class.new(monitored_client, SpecConfig.instance.test_db)
+        database.collections(comment: "comment")
+        command = subscriber.command_started_events("listCollections").last&.command
+        expect(command).not_to be_nil
+        expect(command["comment"]).to eq("comment")
+      end
+    end
   end
 
   describe '#command' do
@@ -678,7 +743,7 @@ describe Mongo::Database do
         client.start_session
       end
 
-      let(:subscriber) { EventSubscriber.new }
+      let(:subscriber) { Mrss::EventSubscriber.new }
 
       let(:client) do
         authorized_client.tap do |client|
@@ -732,12 +797,12 @@ describe Mongo::Database do
         database.cluster.next_primary
       end
 
-      before do
-        expect(primary_server).to receive(:with_connection).at_least(:once).and_call_original
-      end
-
       it 'uses read preference of primary' do
-        expect(database.command(ping: 1)).to be_successful
+        RSpec::Mocks.with_temporary_scope do
+          expect(primary_server).to receive(:with_connection).with(any_args).and_call_original
+
+          expect(database.command(ping: 1)).to be_successful
+        end
       end
     end
 
@@ -760,12 +825,12 @@ describe Mongo::Database do
         described_class.new(client, SpecConfig.instance.test_db, client.options)
       end
 
-      before do
-        expect(primary_server).to receive(:with_connection).at_least(:once).and_call_original
-      end
-
       it 'does not use the client read preference 'do
-        expect(database.command(ping: 1)).to be_successful
+        RSpec::Mocks.with_temporary_scope do
+          expect(primary_server).to receive(:with_connection).with(any_args).and_call_original
+
+          expect(database.command(ping: 1)).to be_successful
+        end
       end
     end
 
@@ -969,7 +1034,7 @@ describe Mongo::Database do
           client.start_session
         end
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           root_authorized_client.tap do |client|

data/spec/mongo/error/operation_failure_heavy_spec.rb

@@ -9,7 +9,7 @@ describe Mongo::Error::OperationFailure do
     # Fail point will work on 4.0 mongod but requires 4.2 for mongos
     min_server_fcv '4.2'
     # Fail point must be set on the same server to which the query is sent
-    require_no_multi_shard
+    require_no_multi_mongos
 
     # https://github.com/mongodb/specifications/commit/7745234f93039a83ae42589a6c0cdbefcffa32fa
     let(:fail_point_command) do
@@ -40,6 +40,9 @@ describe Mongo::Error::OperationFailure do
       begin
         authorized_client['foo'].insert_one(test: 1)
       rescue Mongo::Error::OperationFailure => exc
+        expect(exc.details).to eq(exc.document['writeConcernError']['errInfo'])
+        expect(exc.server_message).to eq(exc.document['writeConcernError']['errmsg'])
+        expect(exc.code).to eq(exc.document['writeConcernError']['code'])
       else
         fail 'Expected an OperationFailure'
       end
@@ -58,4 +61,50 @@ describe Mongo::Error::OperationFailure do
       }
     end
   end
+
+  describe 'WriteError details' do
+    min_server_fcv '5.0'
+
+    let(:subscriber) { Mrss::EventSubscriber.new }
+
+    let(:subscribed_client) do
+      authorized_client.tap do |client|
+        client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+      end
+    end
+
+    let(:collection_name) { 'write_error_prose_spec' }
+
+    let(:collection) do
+      subscribed_client[:collection_name].drop
+      subscribed_client[:collection_name,
+      {
+        'validator' => {
+          'x' => { '$type' => 'string' },
+        }
+      }].create
+      subscribed_client[:collection_name]
+    end
+
+    context 'when there is a write error' do
+      it 'succeeds and prints the error' do
+        begin
+          collection.insert_one({x: 1})
+        rescue Mongo::Error::OperationFailure => e
+          insert_events = subscriber.succeeded_events.select { |e| e.command_name == "insert" }
+          expect(insert_events.length).to eq 1
+          expect(e.message).to match(/\[#{e.code}(:.*)?\].+ -- .+/)
+
+          expect(e.details).to eq(e.document['writeErrors'][0]['errInfo'])
+          expect(e.server_message).to eq(e.document['writeErrors'][0]['errmsg'])
+          expect(e.code).to eq(e.document['writeErrors'][0]['code'])
+
+          expect(e.code).to eq 121
+          expect(e.details).to eq(insert_events[0].reply['writeErrors'][0]['errInfo'])
+        else
+          fail 'Expected an OperationFailure'
+        end
+      end
+    end
+  end
 end

data/spec/mongo/grid/fs_bucket_spec.rb

@@ -362,7 +362,7 @@ describe Mongo::Grid::FSBucket do
         fs.database[fs.files_collection.name].indexes
       end
 
-      before do
+      let(:operation) do
         expect(fs.files_collection).to receive(:indexes).and_call_original
         expect(fs.chunks_collection).to receive(:indexes).and_call_original
         fs.insert_one(file)
@@ -376,26 +376,36 @@ describe Mongo::Grid::FSBucket do
         fs.database[fs.files_collection.name].indexes.get(:filename => 1, :uploadDate => 1)
       end
 
+      it 'tries to create indexes' do
+        expect(fs).to receive(:create_index_if_missing!).twice.and_call_original
+        operation
+      end
+
       it 'creates an index on the files collection' do
+        operation
         expect(files_index[:name]).to eq('filename_1_uploadDate_1')
       end
 
       it 'creates an index on the chunks collection' do
+        operation
         expect(chunks_index[:name]).to eq('files_id_1_n_1')
       end
 
       context 'when a write operation is called more than once' do
 
-        before do
-          expect(fs).not_to receive(:ensure_indexes!)
-        end
-
         let(:file2) do
           Mongo::Grid::File.new('Goodbye!', :filename => 'test2.txt')
         end
 
         it 'only creates the indexes the first time' do
-          expect(fs.insert_one(file2)).to be_a(BSON::ObjectId)
+          RSpec::Mocks.with_temporary_scope do
+            expect(fs).to receive(:create_index_if_missing!).twice.and_call_original
+            operation
+          end
+          RSpec::Mocks.with_temporary_scope do
+            expect(fs).not_to receive(:create_index_if_missing!)
+            expect(fs.insert_one(file2)).to be_a(BSON::ObjectId)
+          end
         end
       end
     end
@@ -404,14 +414,12 @@ describe Mongo::Grid::FSBucket do
 
       before do
         fs.chunks_collection.indexes.create_one(Mongo::Grid::FSBucket::CHUNKS_INDEX, :unique => false)
-        expect(fs.chunks_collection).to receive(:indexes).and_call_original
-        expect(fs.files_collection).not_to receive(:indexes)
       end
 
-      it 'raises the error to the user' do
+      it 'should not raise an error to the user' do
         expect {
           fs.insert_one(file)
-        }.to raise_error(Mongo::Error::OperationFailure)
+        }.not_to raise_error
       end
     end
 
@@ -419,8 +427,6 @@ describe Mongo::Grid::FSBucket do
 
       before do
         support_fs.insert_one(support_file)
-        expect(fs.files_collection).not_to receive(:indexes)
-        expect(fs.chunks_collection).not_to receive(:indexes)
         fs.insert_one(file)
       end
 

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

@@ -259,8 +259,6 @@ describe Mongo::Grid::FSBucket::Stream::Write do
       context 'when the files collection is empty' do
 
         before do
-          expect(fs.files_collection).to receive(:indexes).and_call_original
-          expect(fs.chunks_collection).to receive(:indexes).and_call_original
           stream.write(file)
         end
 
@@ -329,8 +327,6 @@ describe Mongo::Grid::FSBucket::Stream::Write do
         before do
           support_fs.send(:ensure_indexes!)
           support_fs.files_collection.insert_one(a: 1)
-          expect(fs.files_collection).not_to receive(:indexes)
-          expect(fs.chunks_collection).not_to receive(:indexes)
           stream.write(file)
         end
 
@@ -343,18 +339,16 @@ describe Mongo::Grid::FSBucket::Stream::Write do
         end
       end
 
-      context 'when the index creation encounters an error' do
+      context 'when the index creation is done explicitely' do
 
         before do
           fs.chunks_collection.indexes.create_one(Mongo::Grid::FSBucket::CHUNKS_INDEX, :unique => false)
-          expect(fs.chunks_collection).to receive(:indexes).and_call_original
-          expect(fs.files_collection).not_to receive(:indexes)
         end
 
-        it 'raises the error to the user' do
+        it 'should not raise an error to the user' do
           expect {
             stream.write(file)
-          }.to raise_error(Mongo::Error::OperationFailure)
+          }.not_to raise_error
         end
       end
     end

data/spec/mongo/grid/stream_spec.rb

@@ -48,4 +48,4 @@ describe Mongo::Grid::FSBucket::Stream do
       end
     end
   end
-end
+end

data/spec/mongo/index/view_spec.rb

@@ -5,6 +5,18 @@ require 'spec_helper'
 
 describe Mongo::Index::View do
 
+  let(:subscriber) { Mrss::EventSubscriber.new }
+
+  let(:client) do
+    authorized_client.tap do |client|
+      client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+    end
+  end
+
+  let(:authorized_collection) do
+    client[TEST_COLL]
+  end
+
   let(:view) do
     described_class.new(authorized_collection, options)
   end
@@ -140,6 +152,17 @@ describe Mongo::Index::View do
         end
       end
     end
+
+    context 'with a comment' do
+      min_server_version '4.4'
+
+      it 'drops the index' do
+        expect(view.drop_one('another_-1', comment: "comment")).to be_successful
+        command = subscriber.command_started_events("dropIndexes").last&.command
+        expect(command).not_to be_nil
+        expect(command["comment"]).to eq("comment")
+      end
+    end
   end
 
   describe '#drop_all' do
@@ -211,6 +234,17 @@ describe Mongo::Index::View do
           end
         end
       end
+
+      context 'with a comment' do
+        min_server_version '4.4'
+
+        it 'drops indexes' do
+          expect(view.drop_all(comment: "comment")).to be_successful
+          command = subscriber.command_started_events("dropIndexes").last&.command
+          expect(command).not_to be_nil
+          expect(command["comment"]).to eq("comment")
+        end
+      end
     end
   end
 
@@ -266,7 +300,7 @@ describe Mongo::Index::View do
           context 'on server versions >= 4.4' do
             min_server_fcv '4.4'
 
-            let(:subscriber) { EventSubscriber.new }
+            let(:subscriber) { Mrss::EventSubscriber.new }
 
             let(:client) do
               authorized_client.tap do |client|
@@ -672,6 +706,25 @@ describe Mongo::Index::View do
         end
       end
     end
+
+    context 'with a comment' do
+      min_server_version '4.4'
+
+      it 'creates indexes' do
+        expect(
+          view.create_many(
+            [
+              { key: { random: 1 }, unique: true },
+              { key: { testing: -1 }, unique: true }
+            ],
+            comment: "comment"
+          )
+        ).to be_successful
+        command = subscriber.single_command_started_event("createIndexes")&.command
+        expect(command).not_to be_nil
+        expect(command["comment"]).to eq("comment")
+      end
+    end
   end
 
   describe '#create_one' do
@@ -856,6 +909,62 @@ describe Mongo::Index::View do
       end
     end
 
+    context 'when providing an invalid wildcard projection expression' do
+      min_server_fcv '4.2'
+
+      it 'raises an exception' do
+        expect {
+          view.create_one({ '$**' => 1 }, wildcard_projection: 5)
+        }.to raise_error(Mongo::Error::OperationFailure, /Error in specification.*wildcardProjection|wildcardProjection.*must be a non-empty object/)
+      end
+    end
+
+    context 'when providing a wildcard projection to an invalid base index' do
+      min_server_fcv '4.2'
+
+      it 'raises an exception' do
+        expect {
+          view.create_one({ 'x' => 1 }, wildcard_projection: { rating: 1 })
+        }.to raise_error(Mongo::Error::OperationFailure, /Error in specification.*wildcardProjection|wildcardProjection.*is only allowed/)
+      end
+    end
+
+    context 'when providing a valid wildcard projection' do
+      min_server_fcv '4.2'
+
+      let!(:result) do
+        view.create_one({ '$**' => 1 }, wildcard_projection: { 'rating' => 1 })
+      end
+
+      let(:indexes) do
+        authorized_collection.indexes.get('$**_1')
+      end
+
+      it 'returns ok' do
+        expect(result).to be_successful
+      end
+
+      it 'creates an index' do
+        expect(indexes).to_not be_nil
+      end
+
+      context 'on server versions <= 4.4' do
+        max_server_fcv '4.4'
+
+        it 'passes wildcardProjection correctly' do
+          expect(indexes[:wildcardProjection]).to eq({ 'rating' => 1 })
+        end
+      end
+
+      context 'on server versions >= 5.0' do
+        min_server_fcv '5.0'
+
+        it 'passes wildcardProjection correctly' do
+          expect(indexes[:wildcardProjection]).to eq({ '_id' => false, 'rating' => true })
+        end
+      end
+    end
+
     context 'when providing hidden option' do
       let(:index) { view.get('with_hidden_1') }
 
@@ -932,7 +1041,7 @@ describe Mongo::Index::View do
       context 'on server versions >= 4.4' do
         min_server_fcv '4.4'
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           authorized_client.tap do |client|
@@ -988,6 +1097,22 @@ describe Mongo::Index::View do
         end
       end
     end
+
+    context 'with a comment' do
+      min_server_version '4.4'
+
+      it 'creates index' do
+        expect(
+          view.create_one(
+            { 'x' => 1 },
+            comment: "comment"
+          )
+        ).to be_successful
+        command = subscriber.single_command_started_event("createIndexes")&.command
+        expect(command).not_to be_nil
+        expect(command["comment"]).to eq("comment")
+      end
+    end
   end
 
   describe '#get' do