mongo 2.17.4 → 2.18.0.beta1

data/spec/mongo/cluster_spec.rb

@@ -631,50 +631,6 @@ describe Mongo::Cluster do
       end
     end
 
-    context 'when client has not contacted any servers' do
-
-      let(:cluster) do
-        described_class.new(SpecConfig.instance.addresses, monitoring,
-          SpecConfig.instance.test_options.merge(
-            monitoring_io: false, server_selection_timeout: 0.183))
-      end
-
-      context 'in load-balanced topology' do
-        require_topology :load_balanced
-
-        it_behaves_like 'supports sessions'
-      end
-
-      context 'not in load-balanced topology' do
-        require_topology :single, :replica_set, :sharded
-
-        it_behaves_like 'does not support sessions'
-      end
-    end
-
-    context 'when client has contacted servers and then disconnected' do
-      min_server_fcv '3.6'
-      require_wired_tiger
-      require_topology :sharded, :replica_set
-
-      let(:cluster) do
-        described_class.new(SpecConfig.instance.addresses, monitoring,
-          SpecConfig.instance.test_options.merge(
-            server_selection_timeout: 0.183)
-        ).tap do |cluster|
-          register_cluster(cluster)
-        end
-      end
-
-      before do
-        cluster.next_primary
-        cluster.servers_list.map(&:disconnect!)
-        cluster.servers_list.map(&:unknown!)
-      end
-
-      it_behaves_like 'supports sessions'
-    end
-
     context 'in server < 3.6' do
       max_server_version '3.4'
 

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

@@ -38,7 +38,7 @@ describe Mongo::Collection::View::Aggregation do
   end
 
   let(:aggregation_spec) do
-    aggregation.send(:aggregate_spec, server, session, nil)
+    aggregation.send(:aggregate_spec, session, nil)
   end
 
   before do
@@ -366,7 +366,7 @@ describe Mongo::Collection::View::Aggregation do
       end
 
       it 'includes the read preference in the spec' do
-        spec = aggregation.send(:aggregate_spec, server, session, read_preference)
+        spec = aggregation.send(:aggregate_spec, session, read_preference)
         expect(spec[:read]).to eq(read_preference)
       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('server'), double('session'), nil)
+    change_stream.send(:aggregate_spec, double('session'), nil)
   end
 
   let(:cursor) do
@@ -178,7 +178,7 @@ describe Mongo::Collection::View::ChangeStream do
 
       it 'raises the error from the server' do
         expect(error).to be_a(Mongo::Error::OperationFailure)
-        expect(error.message).to include('$changeStream is only valid as the first stage in a pipeline')
+        expect(error.message).to include('is only valid as the first stage in a pipeline')
       end
     end
 

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

@@ -671,6 +671,41 @@ describe Mongo::Collection::View::Readable do
     end
   end
 
+  describe '#count_documents' do
+
+    let(:result) do
+      new_view.count_documents(options)
+    end
+
+    context 'when session is given' do
+      min_server_fcv '3.6'
+
+      let(:subscriber) { Mrss::EventSubscriber.new }
+
+      before do
+        authorized_collection.client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+      end
+
+      let(:connection) do
+        double('connection').tap do |connection|
+          allow(connection).to receive_message_chain(:server, :cluster).and_return(authorized_client.cluster)
+        end
+      end
+
+      it 'passes the session' do
+        authorized_collection.client.with_session do |session|
+          session.materialize_if_needed
+          session_id = session.session_id
+
+          authorized_collection.count_documents({}, session: session)
+
+          event = subscriber.single_command_started_event('aggregate')
+          event.command['lsid'].should == session_id
+        end
+      end
+    end
+  end
+
   describe '#distinct' do
 
     context 'when incorporating read concern' do
@@ -1186,62 +1221,6 @@ describe Mongo::Collection::View::Readable do
     it 'returns a new View' do
       expect(new_view).not_to be(view)
     end
-
-    context 'when sending to server' do
-      let(:subscriber) { Mrss::EventSubscriber.new }
-
-      before do
-        authorized_collection.client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
-      end
-
-      let(:event) do
-        subscriber.single_command_started_event('find')
-      end
-
-      it 'is sent to server' do
-        new_view.to_a
-        event.command.slice('noCursorTimeout').should == {'noCursorTimeout' => true}
-      end
-    end
-
-    context 'integration test' do
-      require_topology :single
-
-      # The number of open cursors with the option set to prevent timeout.
-      def current_no_timeout_count
-        root_authorized_client
-          .command(serverStatus: 1)
-          .documents
-          .first
-          .fetch('metrics')
-          .fetch('cursor')
-          .fetch('open')
-          .fetch('noTimeout')
-      end
-
-      it 'is applied on the server' do
-        # Initialize collection with two documents.
-        new_view.collection.insert_many([{}, {}])
-
-        expect(new_view.count).to be == 2
-
-        # Initial "noTimeout" count should be zero.
-        states = [current_no_timeout_count]
-
-        # The "noTimeout" count should be one while iterating.
-        new_view.batch_size(1).each { states << current_no_timeout_count }
-
-        # Final "noTimeout" count should be back to zero.
-        states << current_no_timeout_count
-
-        # This succeeds on:
-        #   commit aab776ebdfb15ddb9765039f7300e15796de0c5c
-        #
-        # This starts failing with [0, 0, 0, 0] from:
-        #   commit 2d9f0217ec904a1952a1ada2136502eefbca562e
-        expect(states).to be == [0, 1, 1, 0]
-      end
-    end
   end
 
   describe '#projection' do

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

@@ -49,10 +49,24 @@ describe Mongo::Collection::View::Writable do
           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/)
+        context "on 4.4+ servers" do
+          min_server_version '4.4'
+
+          it "doesn't raise an error" do
+            expect do
+              view.find_one_and_delete(hint: '_id_')
+            end.to_not raise_error(Mongo::Error::UnsupportedOption)
+          end
+        end
+
+        context "on <=4.2 servers" do
+          max_server_version '4.2'
+
+          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
     end
@@ -269,10 +283,24 @@ describe Mongo::Collection::View::Writable do
           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/)
+        context "on 4.4+ servers" do
+          min_server_version '4.4'
+
+          it "doesn't raise an error" do
+            expect do
+              view.find_one_and_replace({ field: 'testing' }, { hint: '_id_' })
+            end.to_not raise_error(Mongo::Error::UnsupportedOption)
+          end
+        end
+
+        context "on <=4.2 servers" do
+          max_server_version '4.2'
+
+          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
     end
@@ -512,10 +540,24 @@ describe Mongo::Collection::View::Writable do
           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/)
+        context "on 4.4+ servers" do
+          min_server_version '4.4'
+
+          it "doesn't raise an error" do
+            expect do
+              view.find_one_and_update({ '$set' => { field: 'testing' } }, { hint: '_id_' })
+            end.to_not raise_error(Mongo::Error::UnsupportedOption)
+          end
+        end
+
+        context "on <=4.2 servers" do
+          max_server_version '4.2'
+
+          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
     end
@@ -728,10 +770,24 @@ describe Mongo::Collection::View::Writable do
           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/)
+        context "on 4.4+ servers" do
+          min_server_version '4.4'
+
+          it "doesn't raise an error" do
+            expect do
+              view.delete_many(hint: '_id_')
+            end.to_not raise_error(Mongo::Error::UnsupportedOption)
+          end
+        end
+
+        context "on <=4.2 servers" do
+          max_server_version '4.2'
+
+          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
     end
@@ -915,10 +971,24 @@ describe Mongo::Collection::View::Writable do
           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/)
+        context "on 4.4+ servers" do
+          min_server_version '4.4'
+
+          it "doesn't raise an error" do
+            expect do
+              view.delete_one(hint: '_id_')
+            end.to_not raise_error(Mongo::Error::UnsupportedOption)
+          end
+        end
+
+        context "on <=4.2 servers" do
+          max_server_version '4.2'
+
+          it 'raises a client-side error' do
+            expect do
+              view.delete_one(hint: '_id_')
+            end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+          end
         end
       end
     end
@@ -1103,10 +1173,24 @@ describe Mongo::Collection::View::Writable do
           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/)
+        context "on 4.2+ servers" do
+          min_server_version '4.2'
+
+          it "doesn't raise an error" do
+            expect do
+              view.replace_one({ field: 'testing' }, { hint: '_id_' })
+            end.to_not raise_error(Mongo::Error::UnsupportedOption)
+          end
+        end
+
+        context "on <=4.0 servers" do
+          max_server_version '4.0'
+
+          it 'raises a client-side error' do
+            expect do
+              view.replace_one({ 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
     end
@@ -1360,10 +1444,24 @@ describe Mongo::Collection::View::Writable do
           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/)
+        context "on 4.2+ servers" do
+          min_server_version '4.2'
+
+          it "doesn't raise an error" do
+            expect do
+              view.update_many({ '$set' => { field: 'testing' } }, { hint: '_id_' })
+            end.to_not raise_error(Mongo::Error::UnsupportedOption)
+          end
+        end
+
+        context "on <=4.0 servers" do
+          max_server_version '4.0'
+
+          it 'raises a client-side error' do
+            expect do
+              view.update_many({ '$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
     end
@@ -1623,10 +1721,24 @@ describe Mongo::Collection::View::Writable do
           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/)
+        context "on 4.2+ servers" do
+          min_server_version '4.2'
+
+          it "doesn't raise an error" do
+            expect do
+              view.update_one({ '$set' => { field: 'testing' } }, { hint: '_id_' })
+            end.to_not raise_error(Mongo::Error::UnsupportedOption)
+          end
+        end
+
+        context "on <=4.0 servers" do
+          max_server_version '4.0'
+
+          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
     end

data/spec/mongo/collection_crud_spec.rb

@@ -410,16 +410,22 @@ describe Mongo::Collection do
       it_behaves_like 'an implicit session with an unacknowledged write'
     end
 
-    context 'when a document contains invalid keys' do
+    context 'when a document contains dotted keys' do
 
       let(:docs) do
         [ { 'first.name' => 'test1' }, { name: 'test2' } ]
       end
 
-      it 'raises a BSON::String::IllegalKey exception' do
+      let(:view) { authorized_collection.find({}, { sort: { name: 1 } }) }
+
+      it 'inserts the documents correctly' do
         expect {
           authorized_collection.insert_many(docs)
-        }.to raise_exception(BSON::String::IllegalKey)
+        }.to_not raise_error
+
+        expect(view.count).to eq(2)
+        expect(view.first['first.name']).to eq('test1')
+        expect(view.to_a[1]['name']).to eq('test2')
       end
     end
 
@@ -714,16 +720,19 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the document contains invalid keys' do
+    context 'when the document contains dotted keys' do
 
       let(:doc) do
         { 'testing.test' => 'value' }
       end
 
-      it 'raises a BSON::String::IllegalKey exception' do
+      it 'inserts the document correctly' do
         expect {
           authorized_collection.insert_one(doc)
-        }.to raise_exception(BSON::String::IllegalKey)
+        }.to_not raise_error
+
+        expect(authorized_collection.count).to eq(1)
+        expect(authorized_collection.find.first['testing.test']).to eq('value')
       end
     end
 
@@ -2096,16 +2105,36 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the replace fails' do
+    context 'when the replace has an invalid key' do
 
-      let(:result) do
-        authorized_collection.replace_one(selector, { '$s' => 'test1' })
+      context "when validate_update_replace is true" do
+
+        config_override :validate_update_replace, true
+
+        let(:result) do
+          authorized_collection.replace_one(selector, { '$s' => 'test1' })
+        end
+
+        it 'raises an InvalidReplacementDocument error' do
+          expect {
+            result
+          }.to raise_exception(Mongo::Error::InvalidReplacementDocument)
+        end
       end
 
-      it 'raises an OperationFailure' do
-        expect {
-          result
-        }.to raise_exception(Mongo::Error::OperationFailure)
+      context "when validate_update_replace is false" do
+
+        config_override :validate_update_replace, false
+
+        let(:result) do
+          authorized_collection.replace_one(selector, { '$set' => { 'test1' => 1 } })
+        end
+
+        it 'does not raise an error' do
+          expect {
+            result
+          }.to_not raise_exception
+        end
       end
     end
 
@@ -4362,4 +4391,25 @@ describe Mongo::Collection do
       end
     end
   end
+
+  context 'when unacknowledged writes is used on find_one_and_update' do
+
+    let(:selector) do
+      { name: 'BANG' }
+    end
+
+    let(:collection_with_unacknowledged_write_concern) do
+      authorized_collection.with(write: { w: 0 })
+    end
+
+    let(:result) do
+      collection_with_unacknowledged_write_concern.find_one_and_update(selector,
+        { '$set' => { field: 'testing' }},
+        write_concern: { w: 0 })
+    end
+
+    it 'does not raise an exception' do
+      expect(result).to be_nil
+    end
+  end
 end

data/spec/mongo/config/options_spec.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Mongo::Config::Options do
+
+  let(:config) do
+    Mongo::Config
+  end
+
+  describe "#defaults" do
+
+    it "returns the default options" do
+      expect(config.defaults).to_not be_empty
+    end
+  end
+
+  describe "#option" do
+
+    context "when a default is provided" do
+
+      after do
+        config.reset
+      end
+
+      it "defines a getter" do
+        expect(config.validate_update_replace).to be false
+      end
+
+      it "defines a setter" do
+        expect(config.validate_update_replace = true).to be true
+        expect(config.validate_update_replace).to be true
+      end
+
+      it "defines a presence check" do
+        expect(config.validate_update_replace?).to be false
+      end
+    end
+
+    context 'when option is not a boolean' do
+      before do
+        config.validate_update_replace = 'foo'
+      end
+
+      after do
+        config.reset
+      end
+
+      context 'presence check' do
+        it 'is a boolean' do
+          expect(config.validate_update_replace?).to be true
+        end
+      end
+    end
+  end
+
+  describe "#reset" do
+
+    before do
+      config.validate_update_replace = true
+      config.reset
+    end
+
+    it "resets the settings to the defaults" do
+      expect(config.validate_update_replace).to be false
+    end
+  end
+
+  describe "#settings" do
+
+    it "returns the settings" do
+      expect(config.settings).to_not be_empty
+    end
+  end
+end

data/spec/mongo/config_spec.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Mongo::Config do
+
+  shared_examples "a config option" do
+
+    before do
+      Mongo::Config.reset
+    end
+
+    context 'when the value is false' do
+
+      before do
+        Mongo.send("#{option}=", false)
+      end
+
+      it "is set to false" do
+        expect(Mongo.send(option)).to be(false)
+      end
+    end
+
+    context 'when the value is true' do
+
+      before do
+        Mongo.send("#{option}=", true)
+      end
+
+      it "is set to true" do
+        expect(Mongo.send(option)).to be(true)
+      end
+    end
+
+    context "when it is not set in the config" do
+
+      it "it is set to its default" do
+        expect(Mongo.send(option)).to be(default)
+      end
+    end
+  end
+
+
+  context 'when setting the validate_update_replace option in the config' do
+    let(:option) { :validate_update_replace }
+    let(:default) { false }
+
+    it_behaves_like "a config option"
+  end
+
+  describe "#options=" do
+
+    context "when an option" do
+
+      before do
+        described_class.options = { validate_update_replace: true }
+      end
+
+      it "assigns the option correctly" do
+        expect(described_class.validate_update_replace).to be true
+      end
+    end
+
+    context "when provided a non-existent option" do
+
+      it "raises an error" do
+        expect {
+          described_class.options = { bad_option: true }
+        }.to raise_error(Mongo::Error::InvalidConfigOption)
+      end
+    end
+  end
+end