mongo 2.5.3 → 2.6.0

data/spec/mongo/auth/user/view_spec.rb

@@ -16,8 +16,11 @@ describe Mongo::Auth::User::View do
 
       let!(:response) do
         view.create(
-            'durran',
-            password: 'password', roles: [Mongo::Auth::Roles::READ_WRITE]
+          'durran',
+          {
+            password: 'password',
+            roles: [Mongo::Auth::Roles::READ_WRITE],
+          }
         )
       end
 

data/spec/mongo/auth/user_spec.rb

@@ -119,7 +119,7 @@ describe Mongo::Auth::User do
       end
 
       it 'returns the default' do
-        expect(user.mechanism).to eq(:mongodb_cr)
+        expect(user.mechanism).to be_nil
       end
     end
   end

data/spec/mongo/bulk_write/result_spec.rb

@@ -0,0 +1,120 @@
+require 'lite_spec_helper'
+
+describe Mongo::BulkWrite::Result do
+  let(:results_document) do
+    {'n_inserted' => 2, 'n' => 3, 'inserted_ids' => [1, 2]}
+  end
+
+  let(:subject) { described_class.new(results_document) }
+
+  describe 'construction' do
+    it 'works' do
+      expect(subject).to be_a(described_class)
+    end
+  end
+
+  describe '#inserted_count' do
+    it 'is taken from results document' do
+      expect(subject.inserted_count).to eql(2)
+    end
+  end
+
+  describe '#inserted_ids' do
+    it 'is taken from results document' do
+      expect(subject.inserted_ids).to eql([1, 2])
+    end
+  end
+
+  describe '#deleted_count' do
+    let(:results_document) do
+      {'n_removed' => 2, 'n' => 3}
+    end
+
+    it 'is taken from results document' do
+      expect(subject.deleted_count).to eql(2)
+    end
+  end
+
+  describe '#matched_count' do
+    let(:results_document) do
+      {'n_modified' => 1, 'n_matched' => 2, 'n' => 3}
+    end
+
+    it 'is taken from results document' do
+      expect(subject.matched_count).to eql(2)
+    end
+  end
+
+  describe '#modified_count' do
+    let(:results_document) do
+      {'n_modified' => 1, 'n_matched' => 2, 'n' => 3}
+    end
+
+    it 'is taken from results document' do
+      expect(subject.modified_count).to eql(1)
+    end
+  end
+
+  describe '#upserted_count' do
+    let(:results_document) do
+      {'n_upserted' => 2, 'n' => 3, 'upserted_ids' => [1, 2]}
+    end
+
+    it 'is taken from results document' do
+      expect(subject.upserted_count).to eql(2)
+    end
+  end
+
+  describe '#upserted_ids' do
+    let(:results_document) do
+      {'n_upserted' => 2, 'n' => 3, 'upserted_ids' => [1, 2]}
+    end
+
+    it 'is taken from results document' do
+      expect(subject.upserted_ids).to eql([1, 2])
+    end
+  end
+
+  describe '#validate!' do
+    context 'no errors' do
+      it 'returns self' do
+        expect(subject.validate!).to eql(subject)
+      end
+    end
+
+    context 'with top level error' do
+      let(:results_document) do
+        {'writeErrors' => {
+          'ok' => 0,
+          'errmsg' => 'not master',
+          'code' => 10107,
+          'codeName' => 'NotMaster',
+        }}
+      end
+
+      it 'raises BulkWriteError' do
+        expect do
+          subject.validate!
+        # BulkWriteErrors don't have any messages on them
+        end.to raise_error(Mongo::Error::BulkWriteError, nil)
+      end
+    end
+
+    context 'with write concern error' do
+      let(:results_document) do
+        {'n' => 1, 'writeConcernErrors' => {
+          'errmsg' => 'Not enough data-bearing nodes',
+          'code' => 100,
+          'codeName' => 'CannotSatisfyWriteConcern',
+        }}
+      end
+
+      it 'raises BulkWriteError' do
+        expect do
+          subject.validate!
+        # BulkWriteErrors don't have any messages on them
+        end.to raise_error(Mongo::Error::BulkWriteError, nil)
+      end
+    end
+  end
+end

data/spec/mongo/bulk_write_spec.rb

@@ -1246,6 +1246,38 @@ describe Mongo::BulkWrite do
                 }.to raise_error(Mongo::Error::OperationFailure)
               end
             end
+
+            context 'when write_concern is specified as an option' do
+
+              let(:extra_options) do
+                { write_concern: { w: 0 } }
+              end
+
+              let(:result) do
+                bulk_write.execute
+              end
+
+              it 'updates the document' do
+                result
+                expect(authorized_collection.find(_id: 0).first[:name]).to eq('test')
+              end
+
+              it 'does not report the upserted count' do
+                expect(result.upserted_count).to eq(0)
+              end
+
+              it 'does not report the modified_count count' do
+                expect(result.modified_count).to eq(0)
+              end
+
+              it 'does not report the matched count' do
+                expect(result.matched_count).to eq(0)
+              end
+
+              it 'does not report the upserted id' do
+                expect(result.upserted_ids).to eq([])
+              end
+            end
           end
 
           context 'when the write has a collation specified' do
@@ -2074,8 +2106,12 @@ describe Mongo::BulkWrite do
 
       context 'when the option is true' do
 
+        let(:options) do
+          { ordered: true }
+        end
+
         let(:bulk_write) do
-          described_class.new(authorized_collection, [], ordered: true)
+          described_class.new(authorized_collection, [], options)
         end
 
         it 'returns true' do
@@ -2085,8 +2121,12 @@ describe Mongo::BulkWrite do
 
       context 'when the option is false' do
 
+        let(:options) do
+          { ordered: false }
+        end
+
         let(:bulk_write) do
-          described_class.new(authorized_collection, [], ordered: false)
+          described_class.new(authorized_collection, [], options)
         end
 
         it 'returns false' do

data/spec/mongo/client_spec.rb

@@ -6,6 +6,61 @@ describe Mongo::Client do
     begin; client.close; rescue; end
   end
 
+  describe '.new' do
+    describe 'options' do
+      describe 'read' do
+        [
+          :primary, :primary_preferred, :secondary, :secondary_preferred,  :nearest
+        ].each do |sym|
+          it "accepts #{sym} as symbol" do
+            client = described_class.new(['127.0.0.1:27017'],
+              :read => {:mode => sym})
+            # the key got converted to a string here
+            expect(client.read_preference).to eq({'mode' => sym})
+          end
+
+          # string keys are not documented as being allowed
+          # but the code accepts them
+          it "accepts #{sym} as string" do
+            client = described_class.new(['127.0.0.1:27017'],
+              :read => {:mode => sym.to_s})
+            # the key got converted to a string here
+            # the value remains a string
+            expect(client.read_preference).to eq({'mode' => sym.to_s})
+          end
+        end
+
+        it 'rejects bogus read preference as symbol' do
+          expect do
+            client = described_class.new(['127.0.0.1:27017'],
+              :read => {:mode => :bogus})
+          end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read option: {:mode=>:bogus}: mode bogus is not one of recognized modes')
+        end
+
+        it 'rejects bogus read preference as string' do
+          expect do
+            client = described_class.new(['127.0.0.1:27017'],
+              :read => {:mode => 'bogus'})
+          end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read option: {:mode=>"bogus"}: mode bogus is not one of recognized modes')
+        end
+
+        it 'rejects read option specified as a string' do
+          expect do
+            client = described_class.new(['127.0.0.1:27017'],
+              :read => 'primary')
+          end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read option: primary: must be a hash')
+        end
+
+        it 'rejects read option specified as a symbol' do
+          expect do
+            client = described_class.new(['127.0.0.1:27017'],
+              :read => :primary)
+          end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read option: primary: must be a hash')
+        end
+      end
+    end
+  end
+
   describe '#==' do
 
     let(:client) do
@@ -37,7 +92,7 @@ describe Mongo::Client do
         end
       end
 
-      context 'when the options and cluster are not equal' do
+      context 'when the options are not equal' do
 
         let(:other) do
           described_class.new(
@@ -47,7 +102,22 @@ describe Mongo::Client do
           )
         end
 
-        it 'returns true' do
+        it 'returns false' do
+          expect(client).not_to eq(other)
+        end
+      end
+
+      context 'when cluster is not equal' do
+
+        let(:other) do
+          described_class.new(
+            ['127.0.0.1:27010'],
+            :read => { :mode => :primary },
+            :database => TEST_DB
+          )
+        end
+
+        it 'returns false' do
           expect(client).not_to eq(other)
         end
       end
@@ -128,7 +198,7 @@ describe Mongo::Client do
         end
       end
 
-      context 'when the options and cluster are not equal' do
+      context 'when the options are not equal' do
 
         let(:other) do
           described_class.new(
@@ -138,7 +208,22 @@ describe Mongo::Client do
           )
         end
 
-        it 'returns true' do
+        it 'returns false' do
+          expect(client).not_to eql(other)
+        end
+      end
+
+      context 'when the cluster is not equal' do
+
+        let(:other) do
+          described_class.new(
+            ['127.0.0.1:27010'],
+            :read => { :mode => :primary },
+            :database => TEST_DB
+          )
+        end
+
+        it 'returns false' do
           expect(client).not_to eql(other)
         end
       end
@@ -1242,6 +1327,33 @@ describe Mongo::Client do
         expect(new_client.options.keys).not_to include('invalid')
       end
     end
+
+    context 'when client is created with ipv6 address' do
+      let(:client) do
+        described_class.new(['[::1]:27017'], :database => TEST_DB)
+      end
+
+      context 'when providing nil' do
+
+        it 'returns the cloned client' do
+          expect(client.with(nil)).to eq(client)
+        end
+      end
+
+      context 'when changing options' do
+        let(:new_options) do
+          { app_name: 'client_test' }
+        end
+
+        let!(:new_client) do
+          client.with(new_options)
+        end
+
+        it 'returns a new client' do
+          expect(new_client).not_to equal(client)
+        end
+      end
+    end
   end
 
   describe '#write_concern' do
@@ -1362,7 +1474,7 @@ describe Mongo::Client do
       end
 
       let(:command) do
-        EventSubscriber.started_events.find { |c| c.command_name == :listDatabases }.command
+        EventSubscriber.started_events.find { |c| c.command_name == 'listDatabases' }.command
       end
 
       before do
@@ -1492,8 +1604,8 @@ describe Mongo::Client do
         expect(session).to be_a(Mongo::Session)
       end
 
-      it 'sets the last use field to the current time' do
-        expect(session.instance_variable_get(:@server_session).last_use).to be_within(0.2).of(Time.now)
+      it 'sets the last use field to the current time', retry: 4 do
+        expect(session.instance_variable_get(:@server_session).last_use).to be_within(1).of(Time.now)
       end
 
       context 'when options are provided' do
@@ -1551,8 +1663,8 @@ describe Mongo::Client do
         end
 
         it 'preserves the transaction numbers on the server sessions' do
-          expect(authorized_client.start_session.next_txn_num).to be(2)
-          expect(authorized_client.start_session.next_txn_num).to be(2)
+          expect(authorized_client.start_session.next_txn_num).to be(3)
+          expect(authorized_client.start_session.next_txn_num).to be(3)
         end
       end
 

data/spec/mongo/cluster/app_metadata_spec.rb

@@ -112,7 +112,20 @@ describe Mongo::Cluster::AppMetadata do
         end
 
         it 'truncates the document to be just an ismaster command and the compressors', unless: compression_enabled? do
-          expect(app_metadata.ismaster_bytes.length).to eq(Mongo::Server::Monitor::Connection::ISMASTER_BYTES.length + 26)
+          # Because we sometimes request that the server provide a list of valid auth mechanisms for
+          # the user, we need to conditionally add the length of that metadata to the expected
+          # length of the isMaster document.
+          sasl_supported_mechs_size = 0
+          sasl_supported_mechs = app_metadata.instance_variable_get(:@request_auth_mech)
+
+          if sasl_supported_mechs
+            sasl_supported_mechs_size += 1                               # length of BSON type byte
+            sasl_supported_mechs_size += 'saslSupportedMechs'.length + 1        # length of BSON key
+            sasl_supported_mechs_size += 4                               # length of BSON string length
+            sasl_supported_mechs_size += sasl_supported_mechs.length + 1 # length of BSON string
+          end
+
+          expect(app_metadata.ismaster_bytes.length).to eq(Mongo::Server::Monitor::Connection::ISMASTER_BYTES.length + sasl_supported_mechs_size + 26)
         end
       end
     end

data/spec/mongo/cluster/topology_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lite_spec_helper'
 
 describe Mongo::Cluster::Topology do
 
@@ -105,28 +105,6 @@ describe Mongo::Cluster::Topology do
           expect(topology).to be_a(Mongo::Cluster::Topology::Unknown)
         end
       end
-
-      context 'when provided a single mongos', if: single_mongos? do
-
-        let(:topology) do
-          described_class.initial(ADDRESSES, monitoring, TEST_OPTIONS)
-        end
-
-        it 'returns a sharded topology' do
-          expect(topology).to be_a(Mongo::Cluster::Topology::Sharded)
-        end
-      end
-
-      context 'when provided a single replica set member', if: single_rs_member? do
-
-        let(:topology) do
-          described_class.initial(ADDRESSES, monitoring, TEST_OPTIONS)
-        end
-
-        it 'returns a single topology' do
-          expect(topology).to be_a(Mongo::Cluster::Topology::Single)
-        end
-      end
     end
   end
 end