mongo 2.14.0 → 2.16.0

data/spec/mongo/operation/read_preference_legacy_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::ReadPreferenceSupported do
@@ -30,12 +33,16 @@ describe Mongo::Operation::ReadPreferenceSupported do
     double('description').tap do |description|
       allow(description).to receive(:mongos?).and_return(mongos?)
       allow(description).to receive(:standalone?).and_return(standalone?)
+      # TODO consider adding tests for load-balanced topologies also
+      allow(description).to receive(:load_balancer?).and_return(false)
     end
   end
 
   let(:server) do
     double('server').tap do |server|
       allow(server).to receive(:cluster).and_return(cluster)
+      # TODO consider adding tests for load-balanced topologies also
+      allow(server).to receive(:load_balancer?).and_return(false)
     end
   end
 
@@ -46,103 +53,93 @@ describe Mongo::Operation::ReadPreferenceSupported do
     end
   end
 
-  describe '#add_slave_ok_flag_maybe' do
+  describe '#add_secondary_ok_flag?' do
 
     let(:actual) do
-      operation.send(:add_slave_ok_flag_maybe, operation.send(:options), connection)
+      operation.send(:add_secondary_ok_flag?, connection)
     end
 
-    shared_examples_for 'sets the slave_ok flag as expected' do
-      it 'sets the slave_ok flag as expected' do
+    shared_examples_for 'sets the secondary_ok flag as expected' do
+      it 'sets the secondary_ok flag as expected' do
         expect(actual).to eq(expected)
       end
     end
 
-    shared_examples_for 'never sets slave_ok' do
+    shared_examples_for 'never sets secondary_ok' do
 
-      let(:expected) do
-        { }
-      end
+      let(:expected) { false }
 
       context 'when no read preference is specified' do
         let(:read_pref) { Mongo::ServerSelector.get }
 
-        it_behaves_like 'sets the slave_ok flag as expected'
+        it_behaves_like 'sets the secondary_ok flag as expected'
       end
 
       context 'when primary read preference is specified' do
         let(:read_pref) { Mongo::ServerSelector.get(:mode => :primary) }
 
-        it_behaves_like 'sets the slave_ok flag as expected'
+        it_behaves_like 'sets the secondary_ok flag as expected'
       end
 
       context 'when secondary read preference is specified' do
         let(:read_pref) { Mongo::ServerSelector.get(:mode => :secondary) }
 
-        it_behaves_like 'sets the slave_ok flag as expected'
+        it_behaves_like 'sets the secondary_ok flag as expected'
       end
     end
 
-    shared_examples_for 'always sets slave_ok' do
+    shared_examples_for 'always sets secondary_ok' do
 
-      let(:expected) do
-        { :flags => [ :slave_ok ] }
-      end
+      let(:expected) { true }
 
       context 'when no read preference is specified' do
         let(:read_pref) { Mongo::ServerSelector.get }
 
-        it_behaves_like 'sets the slave_ok flag as expected'
+        it_behaves_like 'sets the secondary_ok flag as expected'
       end
 
       context 'when primary read preference is specified' do
         let(:read_pref) { Mongo::ServerSelector.get(:mode => :primary) }
 
-        it_behaves_like 'sets the slave_ok flag as expected'
+        it_behaves_like 'sets the secondary_ok flag as expected'
       end
 
       context 'when secondary read preference is specified' do
         let(:read_pref) { Mongo::ServerSelector.get(:mode => :secondary) }
 
-        it_behaves_like 'sets the slave_ok flag as expected'
+        it_behaves_like 'sets the secondary_ok flag as expected'
       end
     end
 
-    shared_examples_for 'sets slave_ok if read preference is specified and is not primary' do
+    shared_examples_for 'sets secondary_ok if read preference is specified and is not primary' do
 
       context 'when there is no read preference set' do
 
         let(:read_pref) { Mongo::ServerSelector.get }
 
-        let(:expected) do
-          { }
-        end
+        let(:expected) { false }
 
-        it_behaves_like 'sets the slave_ok flag as expected'
+        it_behaves_like 'sets the secondary_ok flag as expected'
       end
 
       context 'when there is a read preference' do
 
-        context 'when the read preference requires the slave_ok flag' do
+        context 'when the read preference requires the secondary_ok flag' do
 
           let(:read_pref) { Mongo::ServerSelector.get(:mode => :secondary) }
 
-          let(:expected) do
-            { :flags => [ :slave_ok ] }
-          end
+          let(:expected) { true }
 
-          it_behaves_like 'sets the slave_ok flag as expected'
+          it_behaves_like 'sets the secondary_ok flag as expected'
         end
 
-        context 'when the read preference does not require the slave_ok flag' do
+        context 'when the read preference does not require the secondary_ok flag' do
 
           let(:read_pref) { Mongo::ServerSelector.get(:mode => :primary) }
 
-          let(:expected) do
-            { }
-          end
+          let(:expected) { false }
 
-          it_behaves_like 'sets the slave_ok flag as expected'
+          it_behaves_like 'sets the secondary_ok flag as expected'
         end
       end
     end
@@ -156,7 +153,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
 
         let(:standalone?) { true }
 
-        it_behaves_like 'never sets slave_ok'
+        it_behaves_like 'never sets secondary_ok'
       end
 
       context 'when the server is a mongos' do
@@ -164,7 +161,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
         let(:standalone?) { false }
         let(:mongos?) { true }
 
-        it_behaves_like 'always sets slave_ok'
+        it_behaves_like 'always sets secondary_ok'
       end
 
       context 'when the server is a replica set member' do
@@ -172,7 +169,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
         let(:standalone?) { false }
         let(:mongos?) { false }
 
-        it_behaves_like 'always sets slave_ok'
+        it_behaves_like 'always sets secondary_ok'
       end
     end
 
@@ -185,7 +182,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
 
         let(:standalone?) { true }
 
-        it_behaves_like 'never sets slave_ok'
+        it_behaves_like 'never sets secondary_ok'
       end
 
       context 'when the server is a mongos' do
@@ -193,7 +190,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
         let(:standalone?) { false }
         let(:mongos?) { true }
 
-        it_behaves_like 'sets slave_ok if read preference is specified and is not primary'
+        it_behaves_like 'sets secondary_ok if read preference is specified and is not primary'
       end
 
       context 'when the server is a replica set member' do
@@ -201,12 +198,12 @@ describe Mongo::Operation::ReadPreferenceSupported do
         let(:standalone?) { false }
         let(:mongos?) { false }
 
-        it_behaves_like 'sets slave_ok if read preference is specified and is not primary'
+        it_behaves_like 'sets secondary_ok if read preference is specified and is not primary'
       end
     end
   end
 
-  describe '#update_selector_for_read_pref' do
+  describe '#add_read_preference_legacy' do
 
     let(:read_pref) do
       Mongo::ServerSelector.get(:mode => mode)
@@ -215,7 +212,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
     # Behavior of sending $readPreference is the same regardless of topology.
     shared_examples_for '$readPreference in the command' do
       let(:actual) do
-        operation.send(:update_selector_for_read_pref, operation.send(:selector), connection)
+        operation.send(:add_read_preference_legacy, operation.send(:selector), connection)
       end
 
       let(:expected_read_preference) do
@@ -342,7 +339,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
         let(:mongos?) { false }
 
         # $readPreference is not sent to replica set nodes running legacy
-        # servers - the allowance of secondary reads is handled by slave_ok
+        # servers - the allowance of secondary reads is handled by secondary_ok
         # flag.
         it_behaves_like 'does not send read preference'
       end

data/spec/mongo/operation/read_preference_op_msg_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::SessionsSupported do
@@ -38,6 +41,8 @@ describe Mongo::Operation::SessionsSupported do
   let(:server) do
     double('server').tap do |server|
       allow(server).to receive(:cluster).and_return(cluster)
+      # TODO consider adding tests for load-balanced topologies also
+      allow(server).to receive(:load_balancer?).and_return(false)
     end
   end
 
@@ -175,13 +180,13 @@ describe Mongo::Operation::SessionsSupported do
         let(:tag_sets) { nil }
 
         context 'without tag_sets specified' do
-          it_behaves_like 'does not modify selector'
+          it_behaves_like 'adds read preference'
         end
 
         context 'with empty tag_sets' do
           let(:tag_sets) { [] }
 
-          it_behaves_like 'does not modify selector'
+          it_behaves_like 'adds read preference'
         end
 
         context 'with tag_sets specified' do
@@ -256,7 +261,7 @@ describe Mongo::Operation::SessionsSupported do
           let(:hedge) { nil }
 
           context 'when tag_sets and hedge are not specified' do
-            it_behaves_like 'does not modify selector'
+            it_behaves_like 'adds read preference'
           end
 
           context 'when tag_sets are specified' do

data/spec/mongo/operation/remove_user_spec.rb

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::RemoveUser do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   describe '#execute' do
 
@@ -22,7 +28,7 @@ describe Mongo::Operation::RemoveUser do
     context 'when user removal was successful' do
 
       let!(:response) do
-        operation.execute(root_authorized_primary, client: nil)
+        operation.execute(root_authorized_primary, context: context)
       end
 
       it 'removes the user from the database' do
@@ -33,12 +39,12 @@ describe Mongo::Operation::RemoveUser do
     context 'when removal was not successful' do
 
       before do
-        operation.execute(root_authorized_primary, client: nil)
+        operation.execute(root_authorized_primary, context: context)
       end
 
       it 'raises an exception' do
         expect {
-          operation.execute(root_authorized_primary, client: nil)
+          operation.execute(root_authorized_primary, context: context)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end

data/spec/mongo/operation/result_spec.rb

@@ -1,10 +1,15 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::Result do
 
   let(:description) do
-    Mongo::Server::Description.new(double('description address'),
-      'minWireVersion' => 0, 'maxWireVersion' => 2)
+    Mongo::Server::Description.new(
+      double('description address'),
+      { 'minWireVersion' => 0, 'maxWireVersion' => 2 }
+    )
   end
 
   let(:result) do
@@ -31,7 +36,7 @@ describe Mongo::Operation::Result do
     context 'when the reply is for a read command' do
 
       let(:documents) do
-        [{ 'ismaster' => true, 'ok' => 1.0 }]
+        [{ 'isWritablePrimary' => true, 'ok' => 1.0 }]
       end
 
       it 'returns true' do
@@ -145,7 +150,7 @@ describe Mongo::Operation::Result do
     context 'when the reply is for a read command' do
 
       let(:documents) do
-        [{ 'ismaster' => true, 'ok' => 1.0 }]
+        [{ 'hello' => true, 'ok' => 1.0 }]
       end
 
       it 'returns the number returned' do
@@ -337,7 +342,7 @@ describe Mongo::Operation::Result do
       it 'raises OperationFailure' do
         expect do
           result.validate!
-        end.to raise_error(Mongo::Error::OperationFailure, /Replication is being shut down \(91\)/)
+        end.to raise_error(Mongo::Error::OperationFailure, /\[91\]: Replication is being shut down/)
       end
     end
   end

data/spec/mongo/operation/specifiable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::Specifiable do

data/spec/mongo/operation/update/bulk_spec.rb

@@ -1,7 +1,13 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::Update do
-  require_no_multi_shard
+  require_no_multi_mongos
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   let(:documents) do
     [{ :q => { :foo => 1 },
@@ -99,7 +105,7 @@ describe Mongo::Operation::Update do
 
         it 'updates the document' do
           authorized_primary.with_connection do |connection|
-            op.bulk_execute(connection, client: nil)
+            op.bulk_execute(connection, context: context)
           end
           expect(authorized_collection.find(field: 'blah').count).to eq(1)
         end
@@ -125,7 +131,7 @@ describe Mongo::Operation::Update do
 
         it 'updates the documents' do
           authorized_primary.with_connection do |connection|
-            op.bulk_execute(connection, client: nil)
+            op.bulk_execute(connection, context: context)
           end
           expect(authorized_collection.find(field: 'blah').count).to eq(2)
         end
@@ -159,7 +165,7 @@ describe Mongo::Operation::Update do
 
           it 'aborts after first error' do
             authorized_primary.with_connection do |connection|
-              failing_update.bulk_execute(connection, client: nil)
+              failing_update.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find(other: 'blah').count).to eq(0)
           end
@@ -173,7 +179,7 @@ describe Mongo::Operation::Update do
 
           it 'aborts after first error' do
             authorized_primary.with_connection do |connection|
-              failing_update.bulk_execute(connection, client: nil)
+              failing_update.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find(other: 'blah').count).to eq(0)
           end
@@ -208,7 +214,7 @@ describe Mongo::Operation::Update do
 
           it 'does not abort after first error' do
             authorized_primary.with_connection do |connection|
-              failing_update.bulk_execute(connection, client: nil)
+              failing_update.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find(other: 'blah').count).to eq(1)
           end
@@ -222,7 +228,7 @@ describe Mongo::Operation::Update do
 
           it 'does not abort after first error' do
             authorized_primary.with_connection do |connection|
-              failing_update.bulk_execute(connection, client: nil)
+              failing_update.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find(other: 'blah').count).to eq(1)
           end

data/spec/mongo/operation/update/command_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::Update::Command do

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::Update::OpMsg do
@@ -98,7 +101,7 @@ describe Mongo::Operation::Update::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

data/spec/mongo/operation/update_spec.rb

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::Update do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   let(:document) do
     { :q => { :foo => 1 },
@@ -100,7 +106,7 @@ describe Mongo::Operation::Update do
         end
 
         let(:result) do
-          update.execute(authorized_primary, client: nil)
+          update.execute(authorized_primary, context: context)
         end
 
         it 'updates the document' do
@@ -128,7 +134,7 @@ describe Mongo::Operation::Update do
 
         it 'raises an exception' do
           expect {
-            update.execute(authorized_primary, client: nil)
+            update.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
@@ -152,7 +158,7 @@ describe Mongo::Operation::Update do
         end
 
         let(:result) do
-          update.execute(authorized_primary, client: nil)
+          update.execute(authorized_primary, context: context)
         end
 
         it 'updates the documents' do
@@ -180,7 +186,7 @@ describe Mongo::Operation::Update do
 
         it 'raises an exception' do
           expect {
-            update.execute(authorized_primary, client: nil)
+            update.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
@@ -193,7 +199,7 @@ describe Mongo::Operation::Update do
 
         it 'raises an error' do
           expect {
-            update.execute(authorized_primary, client: nil)
+            update.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::MaxBSONSize)
         end
       end
@@ -205,7 +211,7 @@ describe Mongo::Operation::Update do
         end
 
         let(:result) do
-          update.execute(authorized_primary, client: nil)
+          update.execute(authorized_primary, context: context)
         end
 
         it 'inserts the document' do
@@ -243,7 +249,7 @@ describe Mongo::Operation::Update do
       end
 
       let(:result) do
-        update.execute(authorized_primary, client: nil)
+        update.execute(authorized_primary, context: context)
       end
 
       before do

data/spec/mongo/operation/update_user_spec.rb

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::UpdateUser do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   describe '#execute' do
 
@@ -35,7 +41,7 @@ describe Mongo::Operation::UpdateUser do
     context 'when user update was successful' do
 
       let!(:response) do
-        operation.execute(root_authorized_primary, client: nil)
+        operation.execute(root_authorized_primary, context: context)
       end
 
       it 'updates the user in the database' do

data/spec/mongo/options/redacted_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Options::Redacted do

data/spec/mongo/protocol/compressed_spec.rb

@@ -1,4 +1,7 @@
-require 'lite_spec_helper'
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
 
 describe Mongo::Protocol::Compressed do
 
@@ -10,15 +13,35 @@ describe Mongo::Protocol::Compressed do
     described_class.new(original_message, compressor, level)
   end
 
+  let(:original_message_bytes) do
+    buf = BSON::ByteBuffer.new
+    original_message.send(:serialize_fields, buf)
+    buf.to_s
+  end
+
   describe '#serialize' do
 
-    context 'when zlib compression level is not provided' do
+    context "when using the snappy compressor" do
+      require_snappy_compression
+      let(:compressor) { 'snappy' }
 
-      let(:original_message_bytes) do
-        buf = BSON::ByteBuffer.new
-        original_message.send(:serialize_fields, buf)
-        buf.to_s
+      it "uses snappy" do
+        expect(Snappy).to receive(:deflate).with(original_message_bytes).and_call_original
+        message.serialize
       end
+    end
+
+    context "when using the zstd compressor" do
+      require_zstd_compression
+      let(:compressor) { 'zstd' }
+
+      it "uses zstd with default compression level" do
+        expect(Zstd).to receive(:compress).with(original_message_bytes).and_call_original
+        message.serialize
+      end
+    end
+
+    context 'when zlib compression level is not provided' do
 
       it 'does not set a compression level' do
         expect(Zlib::Deflate).to receive(:deflate).with(original_message_bytes, nil).and_call_original
@@ -30,12 +53,6 @@ describe Mongo::Protocol::Compressed do
 
       let(:level) { 1 }
 
-      let(:original_message_bytes) do
-        buf = BSON::ByteBuffer.new
-        original_message.send(:serialize_fields, buf)
-        buf.to_s
-      end
-
       it 'uses the compression level' do
         expect(Zlib::Deflate).to receive(:deflate).with(original_message_bytes, 1).and_call_original
         message.serialize

data/spec/mongo/protocol/delete_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 require 'support/shared/protocol'
 

data/spec/mongo/protocol/get_more_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 require 'support/shared/protocol'
 

data/spec/mongo/protocol/insert_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 require 'support/shared/protocol'
 

data/spec/mongo/protocol/kill_cursors_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 require 'support/shared/protocol'
 

data/spec/mongo/protocol/msg_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 require 'support/shared/protocol'
 
@@ -100,7 +103,7 @@ describe Mongo::Protocol::Msg do
       context 'when the main_document are not equal' do
 
         let(:other_main_document) do
-          { '$db'=> SpecConfig.instance.test_db, ismaster: 1 }
+          { '$db'=> SpecConfig.instance.test_db, hello: 1 }
         end
 
         let(:other) do