mongo 2.18.2 → 2.19.3

data/spec/mongo/cluster_time_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 # TODO convert, move or delete these tests as part of RUBY-2706.
 

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 # TODO convert, move or delete these tests as part of RUBY-2706.
 

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -40,6 +40,10 @@ describe Mongo::Collection::View::MapReduce do
   end
 
   let(:view) do
+    authorized_client.cluster.servers.map do |server|
+      server.pool.ready
+    end
+
     Mongo::Collection::View.new(authorized_collection, selector, view_options)
   end
 
@@ -593,6 +597,7 @@ describe Mongo::Collection::View::MapReduce do
       context 'when the server is not valid for writing' do
         clean_slate
         require_warning_clean
+        require_no_linting
 
         before do
           stop_monitoring(authorized_client)
@@ -615,6 +620,10 @@ describe Mongo::Collection::View::MapReduce do
           end
 
           let(:view) do
+            authorized_client.cluster.servers.map do |server|
+              server.pool.ready
+            end
+
             Mongo::Collection::View.new(collection, selector, view_options)
           end
 
@@ -674,6 +683,7 @@ describe Mongo::Collection::View::MapReduce do
       context 'when the server is a valid for writing' do
         clean_slate
         require_warning_clean
+        require_no_linting
 
         before do
           stop_monitoring(authorized_client)

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -217,6 +217,34 @@ describe Mongo::Collection::View::Readable do
           end
         end
 
+        context "when a :session is given on the view" do
+          let(:opt) { :session }
+          let(:param) { authorized_client.start_session }
+          let(:aggregate) do
+            authorized_collection.find({}, session: param).aggregate(pipeline, options)
+          end
+
+          after do
+            param.end_session
+          end
+
+          context "when broken_view_options is false" do
+            config_override :broken_view_options, false
+
+            it "sets the option correctly" do
+              expect(aggregate.options[opt]).to eq(param)
+            end
+          end
+
+          context "when broken_view_options is true" do
+            config_override :broken_view_options, true
+
+            it "does not set the option" do
+              expect(aggregate.options[opt]).to be nil
+            end
+          end
+        end
+
         context "when also including in options" do
 
           let(:aggregate) do
@@ -418,6 +446,24 @@ describe Mongo::Collection::View::Readable do
           expect(map_reduce.options[:limit]).to eq(2)
         end
       end
+
+      context "when a :session is given on the view" do
+        let(:opt) { :session }
+        let(:param) { authorized_client.start_session }
+        let(:map_reduce) do
+          authorized_collection.find({}, session: param).map_reduce(map, reduce, options)
+        end
+
+        after do
+          param.end_session
+        end
+
+        with_config_values :broken_view_options, true, false do
+          it "sets the option correctly" do
+            expect(map_reduce.options[opt]).to eq(param)
+          end
+        end
+      end
     end
   end
 
@@ -862,6 +908,29 @@ describe Mongo::Collection::View::Readable do
         it_behaves_like "a count option"
       end
 
+      context "when a :session is given on the view" do
+
+        let(:opt) { :session }
+        let(:param) { authorized_client.start_session }
+        let(:aggregate) do
+          authorized_collection.find({}, session: param).aggregate(pipeline, options)
+        end
+
+        after do
+          param.end_session
+        end
+
+        with_config_values :broken_view_options, true, false do
+          it "sets the option correctly" do
+            expect(Mongo::Operation::Count).to receive(:new).once.and_wrap_original do |m, *args|
+              expect(args.first[opt]).to eq(param)
+              m.call(*args)
+            end
+            authorized_collection.find({}, session: param).count(options)
+          end
+        end
+      end
+
       context "when also including in options" do
 
         with_config_values :broken_view_options, true, false do
@@ -1026,6 +1095,25 @@ describe Mongo::Collection::View::Readable do
           end
         end
 
+        context "when a :session is given on the view" do
+          let(:opt) { :session }
+          let(:param) { authorized_client.start_session }
+
+          after do
+            param.end_session
+          end
+
+          with_config_values :broken_view_options, true, false do
+            it "sets the option correctly" do
+              expect(Mongo::Operation::Count).to receive(:new).once.and_wrap_original do |m, *args|
+                expect(args.first[opt]).to eq(param)
+                m.call(*args)
+              end
+              authorized_collection.find({}, session: param).estimated_document_count(options)
+            end
+          end
+        end
+
         context "when also including in options" do
 
           with_config_values :broken_view_options, true, false do
@@ -1179,6 +1267,37 @@ describe Mongo::Collection::View::Readable do
         end
       end
 
+      context "when a :session is given on the view" do
+        let(:opt) { :session }
+        let(:param) { authorized_client.start_session }
+
+        after do
+          param.end_session
+        end
+
+        context "when broken_view_options is false" do
+          config_override :broken_view_options, false
+          it "sets the option correctly" do
+            expect_any_instance_of(Mongo::Collection::View).to receive(:aggregate).once.and_wrap_original do |m, *args|
+              expect(args[1][opt]).to eq(param)
+              m.call(*args)
+            end
+            authorized_collection.find({}, session: param).count_documents(options)
+          end
+        end
+
+        context "when broken_view_options is true" do
+          config_override :broken_view_options, true
+          it "does not set the option" do
+            expect_any_instance_of(Mongo::Collection::View).to receive(:aggregate).once.and_wrap_original do |m, *args|
+              expect(args[1][opt]).to be nil
+              m.call(*args)
+            end
+            authorized_collection.find({}, session: param).count_documents(options)
+          end
+        end
+      end
+
       context "when also including in options" do
 
         with_config_values :broken_view_options, true, false do
@@ -1660,6 +1779,25 @@ describe Mongo::Collection::View::Readable do
         end
       end
 
+      context "when a :session is given on the view" do
+        let(:opt) { :session }
+        let(:param) { authorized_client.start_session }
+
+        after do
+          param.end_session
+        end
+
+        with_config_values :broken_view_options, true, false do
+          it "sets the option correctly" do
+            expect(Mongo::Operation::Distinct).to receive(:new).once.and_wrap_original do |m, *args|
+              expect(args.first[opt]).to eq(param)
+              m.call(*args)
+            end
+            authorized_collection.find({}, session: param).distinct(options)
+          end
+        end
+      end
+
       context "when also including in options" do
 
         with_config_values :broken_view_options, true, false do

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/mongo/collection/view_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/mongo/collection_crud_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/mongo/collection_ddl_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -109,11 +109,7 @@ describe Mongo::Collection do
           end
 
           it_behaves_like 'a capped collection command'
-
-          context 'when validators can be set' do
-            min_server_fcv '3.2'
-            it_behaves_like 'a validated collection command'
-          end
+          it_behaves_like 'a validated collection command'
         end
 
         context 'when instantiating a collection through the database' do
@@ -123,10 +119,51 @@ describe Mongo::Collection do
           end
 
           it_behaves_like 'a capped collection command'
+          it_behaves_like 'a validated collection command'
+        end
+
+        context 'when instantiating a collection using create' do
+
+          before do
+            authorized_client[:specs].drop
+          end
+
+          let!(:response) do
+            authorized_client[:specs].create(options)
+          end
+
+          let(:collection) do
+            authorized_client[:specs]
+          end
+
+          let(:collstats) do
+            collection.aggregate([ {'$collStats' => { 'storageStats' => {} }} ]).first
+          end
+
+          let(:storage_stats) do
+            collstats.fetch('storageStats', {})
+          end
+
+          let(:options) do
+            { :capped => true, :size => 4096, :max => 512 }
+          end
 
-          context 'when validators can be set' do
-            min_server_fcv '3.2'
-            it_behaves_like 'a validated collection command'
+          it 'executes the command' do
+            expect(response).to be_successful
+          end
+
+          it 'sets the collection as capped' do
+            expect(collection).to be_capped
+          end
+
+          it 'creates the collection in the database' do
+            expect(database.collection_names).to include('specs')
+          end
+
+          it "applies the options" do
+            expect(storage_stats["capped"]).to be true
+            expect(storage_stats["max"]).to eq(512)
+            expect(storage_stats["maxSize"]).to eq(4096)
           end
         end
       end
@@ -148,7 +185,6 @@ describe Mongo::Collection do
         end
 
         context 'when the server supports write concern on the create command' do
-          min_server_fcv '3.4'
           require_topology :replica_set
 
           it 'applies the write concern' do
@@ -159,7 +195,6 @@ describe Mongo::Collection do
         end
 
         context 'when write concern passed in as an option' do
-          min_server_fcv '3.4'
           require_topology :replica_set
 
           before do
@@ -189,14 +224,6 @@ describe Mongo::Collection do
             expect(command[:writeConcern][:w]).to eq(2)
           end
         end
-
-        context 'when the server does not support write concern on the create command' do
-          max_server_version '3.2'
-
-          it 'does not apply the write concern' do
-            expect(collection.create).to be_successful
-          end
-        end
       end
 
       context 'when the collection has a collation' do
@@ -219,45 +246,18 @@ describe Mongo::Collection do
             collection.drop
           end
 
-          context 'when the server supports collations' do
-            min_server_fcv '3.4'
-
-            it 'executes the command' do
-              expect(response).to be_successful
-            end
-
-            it 'sets the collection with a collation' do
-              response
-              expect(collection_info['options']['collation']['locale']).to eq('fr')
-            end
-
-            it 'creates the collection in the database' do
-              response
-              expect(database.collection_names).to include('specs')
-            end
+          it 'executes the command' do
+            expect(response).to be_successful
           end
 
-          context 'when the server does not support collations' do
-            max_server_version '3.2'
-
-            it 'raises an error' do
-              expect {
-                response
-              }.to raise_exception(Mongo::Error::UnsupportedCollation)
-            end
-
-            context 'when a String key is used' do
-
-              let(:options) do
-                { 'collation' => { locale: 'fr' } }
-              end
+          it 'sets the collection with a collation' do
+            response
+            expect(collection_info['options']['collation']['locale']).to eq('fr')
+          end
 
-              it 'raises an exception' do
-                expect {
-                  response
-                }.to raise_exception(Mongo::Error::UnsupportedCollation)
-              end
-            end
+          it 'creates the collection in the database' do
+            response
+            expect(database.collection_names).to include('specs')
           end
         end
 
@@ -278,6 +278,43 @@ describe Mongo::Collection do
 
           it_behaves_like 'a collection command with a collation option'
         end
+
+        context 'when passing the options through create' do
+
+          let(:collection) do
+            authorized_client[:specs]
+          end
+
+          let(:response) do
+            collection.create(options)
+          end
+
+          let(:options) do
+            { :collation => { locale: 'fr' } }
+          end
+
+          let(:collection_info) do
+            database.list_collections.find { |i| i['name'] == 'specs' }
+          end
+
+          before do
+            collection.drop
+          end
+
+          it 'executes the command' do
+            expect(response).to be_successful
+          end
+
+          it 'sets the collection with a collation' do
+            response
+            expect(collection_info['options']['collation']['locale']).to eq('fr')
+          end
+
+          it 'creates the collection in the database' do
+            response
+            expect(database.collection_names).to include('specs')
+          end
+        end
       end
 
       context 'when a session is provided' do
@@ -312,7 +349,6 @@ describe Mongo::Collection do
     end
 
     context 'when collation has a strength' do
-      min_server_fcv '3.4'
 
       let(:band_collection) do
         described_class.new(database, :bands)
@@ -398,6 +434,7 @@ describe Mongo::Collection do
 
         context 'when the collection does not exist' do
           require_set_write_concern
+          max_server_fcv '6.99.99'
 
           it 'does not raise an error' do
             expect(database['non-existent-coll'].drop).to be(false)
@@ -418,7 +455,6 @@ describe Mongo::Collection do
         end
 
         context 'when the server supports write concern on the drop command' do
-          min_server_fcv '3.4'
           require_set_write_concern
 
           it 'applies the write concern' do
@@ -429,7 +465,6 @@ describe Mongo::Collection do
         end
 
         context 'when write concern passed in as an option' do
-          min_server_fcv '3.4'
           require_set_write_concern
 
           let(:events) do
@@ -455,19 +490,12 @@ describe Mongo::Collection do
             expect(command[:writeConcern][:w]).to eq(0)
           end
         end
-
-        context 'when the server does not support write concern on the drop command' do
-          max_server_version '3.2'
-
-          it 'does not apply the write concern' do
-            expect(collection_with_write_options.drop).to be_successful
-          end
-        end
       end
     end
 
     context 'when the collection does not exist' do
       require_set_write_concern
+      max_server_fcv '6.99.99'
 
       before do
         begin
@@ -480,6 +508,28 @@ describe Mongo::Collection do
         expect(collection.drop).to be(false)
       end
     end
+
+    context "when providing a pipeline in create" do
+
+      let(:options) do
+        { view_on: "specs", pipeline: [ { :'$project' => { "baz": "$bar" } } ] }
+      end
+
+      before do
+        authorized_client["my_view"].drop
+        authorized_client[:specs].drop
+      end
+
+      it "the pipeline gets passed to the command" do
+        expect(Mongo::Operation::Create).to receive(:new).and_wrap_original do |m, *args|
+          expect(args.first.slice(:selector)[:selector]).to have_key(:pipeline)
+          expect(args.first.slice(:selector)[:selector]).to have_key(:viewOn)
+          m.call(*args)
+        end
+        expect_any_instance_of(Mongo::Operation::Create).to receive(:execute)
+        authorized_client[:specs].create(options)
+      end
+    end
   end
 
   describe '#indexes' do

data/spec/mongo/collection_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -651,7 +651,11 @@ describe Mongo::Collection do
       end
 
       let(:collstats) do
-        database.read_command(:collstats => :specs).documents.first
+        collection.aggregate([ {'$collStats' => { 'storageStats' => {} }} ]).first
+      end
+
+      let(:storage_stats) do
+        collstats.fetch('storageStats', {})
       end
 
       before do
@@ -664,9 +668,9 @@ describe Mongo::Collection do
       end
 
       it "applies the options" do
-        expect(collstats["capped"]).to be true
-        expect(collstats["max"]).to eq(512)
-        expect(collstats["maxSize"]).to eq(4096)
+        expect(storage_stats["capped"]).to be true
+        expect(storage_stats["max"]).to eq(512)
+        expect(storage_stats["maxSize"]).to eq(4096)
       end
     end
 
@@ -834,9 +838,9 @@ describe Mongo::Collection do
         end
 
         it "waits the appropriate amount of time" do
-          start_time = Time.now
+          start_time = Mongo::Utils.monotonic_time
           enum.try_next
-          end_time = Time.now
+          end_time = Mongo::Utils.monotonic_time
 
           expect(end_time-start_time).to be >= 3
         end