mongo 2.15.0 → 2.17.0

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

@@ -29,8 +29,16 @@ describe Mongo::Collection::View::Aggregation do
     described_class.new(view, pipeline, options)
   end
 
+  let(:server) do
+    double('server')
+  end
+
+  let(:session) do
+    double('session')
+  end
+
   let(:aggregation_spec) do
-    aggregation.send(:aggregate_spec, double('session'))
+    aggregation.send(:aggregate_spec, server, session, nil)
   end
 
   before do
@@ -235,7 +243,7 @@ describe Mongo::Collection::View::Aggregation do
         { session: session }
       end
 
-      let(:subscriber) { EventSubscriber.new }
+      let(:subscriber) { Mrss::EventSubscriber.new }
 
       let(:client) do
         authorized_client.tap do |client|
@@ -351,15 +359,15 @@ describe Mongo::Collection::View::Aggregation do
 
   describe '#aggregate_spec' do
 
-    context 'when the collection has a read preference' do
+    context 'when a read preference is given' do
 
       let(:read_preference) do
-        {mode: :secondary}
+        BSON::Document.new({mode: :secondary})
       end
 
       it 'includes the read preference in the spec' do
-        allow(authorized_collection).to receive(:read_preference).and_return(read_preference)
-        expect(aggregation_spec[:read]).to eq(read_preference)
+        spec = aggregation.send(:aggregate_spec, server, session, read_preference)
+        expect(spec[:read]).to eq(read_preference)
       end
     end
 
@@ -570,109 +578,77 @@ describe Mongo::Collection::View::Aggregation do
   end
 
   context 'when $out is in the pipeline' do
-
-    let(:pipeline) do
-      [{
-           "$group" => {
-               "_id" => "$city",
-               "totalpop" => { "$sum" => "$pop" }
+    [['$out', 'string'], [:$out, 'symbol']].each do |op, type|
+      context "when #{op} is a #{type}" do
+        let(:pipeline) do
+          [{
+               "$group" => {
+                   "_id" => "$city",
+                   "totalpop" => { "$sum" => "$pop" }
+               }
+           },
+           {
+               op => 'output_collection'
            }
-       },
-       {
-           '$out' => 'output_collection'
-       }
-      ]
-    end
-
-    before do
-      authorized_client['output_collection'].delete_many
-    end
-
-    context 'when $out is a string' do
-
-      it 'does not allow the operation on a secondary' do
-        expect(aggregation.send(:secondary_ok?)).to be(false)
-      end
-    end
-
-    context 'when $out is a symbol' do
-
-      let(:pipeline) do
-        [{
-             "$group" => {
-                 "_id" => "$city",
-                 "totalpop" => { "$sum" => "$pop" }
-             }
-         },
-         {
-             :$out => 'output_collection'
-         }
-        ]
-      end
-
-      it 'does not allow the operation on a secondary' do
-        expect(aggregation.send(:secondary_ok?)).to be(false)
-      end
-    end
+          ]
+        end
 
+        before do
+          authorized_client['output_collection'].delete_many
+        end
 
-    context 'when the server is not a valid for writing' do
+        let(:features) do
+          double()
+        end
 
-     it 'reroutes the operation to a primary' do
-       allow(aggregation).to receive(:valid_server?).and_return(false)
-       expect(Mongo::Logger.logger).to receive(:warn).and_call_original
-       aggregation.to_a
-     end
-    end
+        let(:server) do
+          double().tap do |server|
+            allow(server).to receive(:features).and_return(features)
+          end
+        end
 
-    context 'when the server is a valid for writing' do
+        context 'when the view has a write concern' do
 
-     it 'does not reroute the operation to a primary' do
-       expect(Mongo::Logger.logger).not_to receive(:warn)
-       aggregation.to_a
-     end
+          let(:collection) do
+            authorized_collection.with(write: INVALID_WRITE_CONCERN)
+          end
 
-     context 'when the view has a write concern' do
+          let(:view) do
+            Mongo::Collection::View.new(collection, selector, view_options)
+          end
 
-       let(:collection) do
-         authorized_collection.with(write: INVALID_WRITE_CONCERN)
-       end
+          context 'when the server supports write concern on the aggregate command' do
+            min_server_fcv '3.4'
 
-       let(:view) do
-         Mongo::Collection::View.new(collection, selector, view_options)
-       end
+            it 'uses the write concern' do
+              expect {
+                aggregation.to_a
+              }.to raise_exception(Mongo::Error::OperationFailure)
+            end
+          end
 
-       context 'when the server supports write concern on the aggregate command' do
-        min_server_fcv '3.4'
+          context 'when the server does not support write concern on the aggregation command' do
+            max_server_version '3.2'
 
-         it 'uses the write concern' do
-           expect {
-             aggregation.to_a
-           }.to raise_exception(Mongo::Error::OperationFailure)
-         end
-       end
+            let(:documents) do
+              [
+                { city: "Berlin", pop: 18913, neighborhood: "Kreuzberg" },
+                { city: "Berlin", pop: 84143, neighborhood: "Mitte" },
+                { city: "New York", pop: 40270, neighborhood: "Brooklyn" }
+              ]
+            end
 
-       context 'when the server does not support write concern on the aggregation command' do
-        max_server_version '3.2'
+            before do
+              authorized_collection.insert_many(documents)
+              aggregation.to_a
+            end
 
-         let(:documents) do
-           [
-             { city: "Berlin", pop: 18913, neighborhood: "Kreuzberg" },
-             { city: "Berlin", pop: 84143, neighborhood: "Mitte" },
-             { city: "New York", pop: 40270, neighborhood: "Brooklyn" }
-           ]
-         end
-
-         before do
-           authorized_collection.insert_many(documents)
-           aggregation.to_a
-         end
-
-         it 'does not apply the write concern' do
-           expect(authorized_client['output_collection'].find.count).to eq(2)
-         end
-       end
-     end
+            it 'does not apply the write concern' do
+              expect(authorized_client['output_collection'].find.count).to eq(2)
+            end
+          end
+        end
+      end
     end
   end
 end

data/spec/mongo/collection/view/builder/find_command_spec.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
+# TODO convert, move or delete these tests as part of RUBY-2706.
+
+=begin
 require 'lite_spec_helper'
 
 describe Mongo::Collection::View::Builder::FindCommand do
@@ -522,3 +525,4 @@ describe Mongo::Collection::View::Builder::FindCommand do
     end
   end
 end
+=end

data/spec/mongo/collection/view/builder/op_query_spec.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
+# TODO convert, move or delete these tests as part of RUBY-2706.
+
+=begin
 require 'spec_helper'
 
 describe Mongo::Collection::View::Builder::OpQuery do
@@ -155,3 +158,4 @@ describe Mongo::Collection::View::Builder::OpQuery do
     end
   end
 end
+=end

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

@@ -56,7 +56,7 @@ describe Mongo::Collection::View::ChangeStream do
 
   let(:command_spec) do
     change_stream.send(:instance_variable_set, '@resuming', false)
-    change_stream.send(:aggregate_spec, double('session'))
+    change_stream.send(:aggregate_spec, double('server'), double('session'), nil)
   end
 
   let(:cursor) do

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

@@ -60,6 +60,14 @@ describe Mongo::Collection::View::MapReduce do
     described_class.new(view, map, reduce, options)
   end
 
+  describe '#initialize' do
+    it 'warns of deprecation' do
+      Mongo::Logger.logger.should receive(:warn).with('MONGODB | The map_reduce operation is deprecated, please use the aggregation pipeline instead')
+
+      map_reduce
+    end
+  end
+
   describe '#map_function' do
 
     it 'returns the map function' do
@@ -242,7 +250,7 @@ describe Mongo::Collection::View::MapReduce do
             Mongo::Collection::View.new(client[TEST_COLL], selector, view_options)
           end
 
-          let(:subscriber) { EventSubscriber.new }
+          let(:subscriber) { Mrss::EventSubscriber.new }
 
           let(:client) do
             authorized_client.tap do |client|
@@ -672,7 +680,12 @@ describe Mongo::Collection::View::MapReduce do
         end
 
         it 'does not reroute the operation to a primary' do
-          expect(Mongo::Logger.logger).not_to receive(:warn)
+          # We produce a deprecation warning, but there shouldn't be
+          # the reroute warning.
+          expect(Mongo::Logger.logger).to receive(:warn).once do |msg|
+            expect(msg).not_to include('Rerouting the MapReduce operation to the primary server')
+          end
+
           map_reduce.to_a
         end
       end

data/spec/mongo/collection_crud_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 
 describe Mongo::Collection do
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|
@@ -1894,6 +1894,11 @@ describe Mongo::Collection do
     context 'when a session supporting causal consistency is used' do
       require_wired_tiger
 
+      before do
+        collection.drop
+        collection.create
+      end
+
       let(:cursors) do
         collection.parallel_scan(2, session: session)
       end
@@ -4352,7 +4357,7 @@ describe Mongo::Collection do
         expect(command[:writeConcern]).to_not be_nil
         expect(command[:writeConcern][:w]).to eq(1)
         expect(command[:upsert]).to be(true)
-        expect(command[:bypassDocumentValidation]).to be_nil
+        expect(command[:bypassDocumentValidation]).to be false
         expect(command[:maxTimeMS]).to eq(200)
       end
     end

data/spec/mongo/collection_ddl_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 
 describe Mongo::Collection do
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|

data/spec/mongo/collection_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 
 describe Mongo::Collection do
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|

data/spec/mongo/cursor/builder/get_more_command_spec.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
+# TODO convert, move or delete these tests as part of RUBY-2706.
+
+=begin
 require 'spec_helper'
 
 describe Mongo::Cursor::Builder::GetMoreCommand do
@@ -189,3 +192,4 @@ describe Mongo::Cursor::Builder::GetMoreCommand do
     end
   end
 end
+=end

data/spec/mongo/cursor/builder/op_get_more_spec.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
+# TODO convert, move or delete these tests as part of RUBY-2706.
+
+=begin
 require 'spec_helper'
 
 describe Mongo::Cursor::Builder::OpGetMore do
@@ -62,3 +65,4 @@ describe Mongo::Cursor::Builder::OpGetMore do
     end
   end
 end
+=end

data/spec/mongo/cursor_spec.rb

@@ -80,6 +80,8 @@ describe Mongo::Cursor do
     end
 
     context 'server is unknown' do
+      require_topology :single, :replica_set, :sharded
+
       let(:server) do
         view.send(:server_selector).select_server(authorized_client.cluster).tap do |server|
           authorized_client.cluster.disconnect!
@@ -329,8 +331,7 @@ describe Mongo::Cursor do
 
       before do
         authorized_collection.insert_many(documents)
-        cluster.schedule_kill_cursor(cursor.id,
-                                     cursor.send(:kill_cursors_op_spec),
+        cluster.schedule_kill_cursor(cursor.kill_spec,
                                      cursor.instance_variable_get(:@server))
       end
 
@@ -429,7 +430,7 @@ describe Mongo::Cursor do
 
       it 'removes the cursor id from the active cursors tracked by the cluster cursor manager' do
         enum.next
-        expect(cursor_reaper.instance_variable_get(:@active_cursors)).not_to include(cursor_id)
+        expect(cursor_reaper.instance_variable_get(:@active_cursor_ids)).not_to include(cursor_id)
       end
     end
   end
@@ -437,7 +438,7 @@ describe Mongo::Cursor do
   context 'when an implicit session is used' do
     min_server_fcv '3.6'
 
-    let(:subscriber) { EventSubscriber.new }
+    let(:subscriber) { Mrss::EventSubscriber.new }
 
     let(:subscribed_client) do
       authorized_client.tap do |client|
@@ -555,8 +556,17 @@ describe Mongo::Cursor do
         db_name: SpecConfig.instance.test_db, coll_name: TEST_COLL }
     end
 
+    let(:conn_desc) do
+      double('connection description').tap do |cd|
+        allow(cd).to receive(:service_id).and_return(nil)
+      end
+    end
+
     let(:reply) do
-      Mongo::Operation::Find.new(query_spec).tap do |reply|
+      double('reply').tap do |reply|
+        allow(reply).to receive(:is_a?).with(Mongo::Operation::Result).and_return(true)
+        allow(reply).to receive(:namespace)
+        allow(reply).to receive(:connection_description).and_return(conn_desc)
         allow(reply).to receive(:cursor_id).and_return(42)
       end
     end

data/spec/mongo/database_spec.rb

@@ -218,7 +218,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|
@@ -391,7 +391,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|
@@ -583,7 +583,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|
@@ -678,7 +678,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 +732,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 +760,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 +969,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

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

@@ -266,7 +266,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|
@@ -932,7 +932,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|

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

@@ -95,7 +95,7 @@ describe Mongo::Operation::Delete::OpMsg do
     context 'when write concern is specified' do
 
       it 'includes write concern in the selector' do
-        expect(op.send(:command, connection)[:writeConcern]).to eq(write_concern.options)
+        expect(op.send(:command, connection)[:writeConcern]).to eq(BSON::Document.new(write_concern.options))
       end
     end
   end