mongo 2.14.0.rc1 → 2.15.1

data/spec/mongo/dbref_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 require 'json'
 

data/spec/mongo/distinguishing_semaphore_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 describe Mongo::DistinguishingSemaphore do

data/spec/mongo/error/bulk_write_error_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 describe Mongo::Error::BulkWriteError do
@@ -31,19 +34,19 @@ describe Mongo::Error::BulkWriteError do
 
   describe '#message' do
     it 'is correct' do
-      expect(error.message).to eq("message1 (1), message2 (2) (note1, note2)")
+      expect(error.message).to eq("Multiple errors: [1]: message1; [2]: message2 (note1, note2)")
     end
   end
 
   describe '#to_s' do
     it 'is correct' do
-      expect(error.to_s).to eq("message1 (1), message2 (2) (note1, note2)")
+      expect(error.to_s).to eq("Multiple errors: [1]: message1; [2]: message2 (note1, note2)")
     end
   end
 
   describe '#inspect' do
     it 'is correct' do
-      expect(error.inspect).to eq("#<Mongo::Error::BulkWriteError: message1 (1), message2 (2) (note1, note2)>")
+      expect(error.inspect).to eq("#<Mongo::Error::BulkWriteError: Multiple errors: [1]: message1; [2]: message2 (note1, note2)>")
     end
   end
 end

data/spec/mongo/error/crypt_error_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 describe Mongo::Error::CryptError do

data/spec/mongo/error/max_bson_size_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 describe Mongo::Error::MaxBSONSize do

data/spec/mongo/error/no_server_available_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 describe Mongo::Error::NoServerAvailable do

data/spec/mongo/error/notable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 describe Mongo::Error::Notable do

data/spec/mongo/error/operation_failure_heavy_spec.rb

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

data/spec/mongo/error/operation_failure_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 describe Mongo::Error::OperationFailure do
@@ -82,9 +85,12 @@ describe Mongo::Error::OperationFailure do
 
         context 'wire protocol version < 9' do
           let(:description) do
-            Mongo::Server::Description.new('',
-              'minWireVersion' => 0,
-              'maxWireVersion' => 8,
+            Mongo::Server::Description.new(
+              '',
+              {
+                'minWireVersion' => 0,
+                'maxWireVersion' => 8,
+              }
             )
           end
 
@@ -95,9 +101,12 @@ describe Mongo::Error::OperationFailure do
 
         context 'wire protocol version >= 9' do
           let(:description) do
-            Mongo::Server::Description.new('',
-              'minWireVersion' => 0,
-              'maxWireVersion' => 9,
+            Mongo::Server::Description.new(
+              '',
+              {
+                'minWireVersion' => 0,
+                'maxWireVersion' => 9,
+              }
             )
           end
 
@@ -119,9 +128,12 @@ describe Mongo::Error::OperationFailure do
 
         context 'wire protocol version < 9' do
           let(:description) do
-            Mongo::Server::Description.new('',
-              'minWireVersion' => 0,
-              'maxWireVersion' => 8,
+            Mongo::Server::Description.new(
+              '',
+              {
+                'minWireVersion' => 0,
+                'maxWireVersion' => 8,
+              }
             )
           end
 
@@ -145,9 +157,12 @@ describe Mongo::Error::OperationFailure do
 
         context 'wire protocol version < 9' do
           let(:description) do
-            Mongo::Server::Description.new('',
-              'minWireVersion' => 0,
-              'maxWireVersion' => 8,
+            Mongo::Server::Description.new(
+              '',
+              {
+                'minWireVersion' => 0,
+                'maxWireVersion' => 8,
+              }
             )
           end
 
@@ -158,9 +173,12 @@ describe Mongo::Error::OperationFailure do
 
         context 'wire protocol version >= 9' do
           let(:description) do
-            Mongo::Server::Description.new('',
-              'minWireVersion' => 0,
-              'maxWireVersion' => 9,
+            Mongo::Server::Description.new(
+              '',
+              {
+                'minWireVersion' => 0,
+                'maxWireVersion' => 9,
+              }
             )
           end
 
@@ -199,9 +217,12 @@ describe Mongo::Error::OperationFailure do
 
         context 'wire protocol version < 9' do
           let(:description) do
-            Mongo::Server::Description.new('',
-              'minWireVersion' => 0,
-              'maxWireVersion' => 8,
+            Mongo::Server::Description.new(
+              '',
+              {
+                'minWireVersion' => 0,
+                'maxWireVersion' => 8,
+              }
             )
           end
 
@@ -213,9 +234,12 @@ describe Mongo::Error::OperationFailure do
 
         context 'wire protocol version >= 9' do
           let(:description) do
-            Mongo::Server::Description.new('',
-              'minWireVersion' => 0,
-              'maxWireVersion' => 9,
+            Mongo::Server::Description.new(
+              '',
+              {
+                'minWireVersion' => 0,
+                'maxWireVersion' => 9,
+              }
             )
           end
 
@@ -236,9 +260,12 @@ describe Mongo::Error::OperationFailure do
 
         context 'wire protocol < 9' do
           let(:description) do
-            Mongo::Server::Description.new('',
-              'minWireVersion' => 0,
-              'maxWireVersion' => 8,
+            Mongo::Server::Description.new(
+              '',
+              {
+                'minWireVersion' => 0,
+                'maxWireVersion' => 8,
+              }
             )
           end
 
@@ -252,9 +279,12 @@ describe Mongo::Error::OperationFailure do
 
         context 'wire protocol >= 9' do
           let(:description) do
-            Mongo::Server::Description.new('',
-              'minWireVersion' => 0,
-              'maxWireVersion' => 9,
+            Mongo::Server::Description.new(
+              '',
+              {
+                'minWireVersion' => 0,
+                'maxWireVersion' => 9,
+              }
             )
           end
 
@@ -280,9 +310,12 @@ describe Mongo::Error::OperationFailure do
 
         context 'wire protocol version < 9' do
           let(:description) do
-            Mongo::Server::Description.new('',
-              'minWireVersion' => 0,
-              'maxWireVersion' => 8,
+            Mongo::Server::Description.new(
+              '',
+              {
+                'minWireVersion' => 0,
+                'maxWireVersion' => 8,
+              }
             )
           end
 
@@ -409,6 +442,16 @@ describe Mongo::Error::OperationFailure do
           :code => 999, :code_name => nil)
       end
 
+      it 'is false' do
+        expect(subject.not_master?).to be false
+      end
+    end
+
+    context 'not master in message without code' do
+      subject do
+        described_class.new('not master)', nil)
+      end
+
       it 'is true' do
         expect(subject.not_master?).to be true
       end
@@ -471,17 +514,37 @@ describe Mongo::Error::OperationFailure do
           :code => 999, :code_name => nil)
       end
 
+      it 'is false' do
+        expect(subject.node_recovering?).to be false
+      end
+    end
+
+    context 'node is recovering in message without code' do
+      subject do
+        described_class.new('node is recovering', nil)
+      end
+
       it 'is true' do
         expect(subject.node_recovering?).to be true
       end
     end
 
-    context 'not master or secondary text' do
+    context 'not master or secondary text with a code' do
       subject do
         described_class.new('not master or secondary (999)', nil,
           :code => 999, :code_name => nil)
       end
 
+      it 'is false' do
+        expect(subject.node_recovering?).to be false
+      end
+    end
+
+    context 'not master or secondary text without code' do
+      subject do
+        described_class.new('not master or secondary', nil)
+      end
+
       it 'is true' do
         expect(subject.node_recovering?).to be true
       end

data/spec/mongo/error/parser_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Error::Parser do
@@ -25,10 +28,22 @@ describe Mongo::Error::Parser do
       end
 
       it 'returns the message' do
-        expect(parser.message).to eq('no such command: notacommand (59)')
+        expect(parser.message).to eq('[59]: no such command: notacommand')
+      end
+    end
+
+    context 'when the document contains an errmsg and code name' do
+
+      let(:document) do
+        { 'errmsg' => 'no such command: notacommand', 'code' => 59, 'codeName' => 'foo' }
+      end
+
+      it 'returns the message' do
+        expect(parser.message).to eq('[59:foo]: no such command: notacommand')
       end
     end
 
+=begin
     context 'when the document contains writeErrors' do
 
       context 'when only a single error exists' do
@@ -38,7 +53,7 @@ describe Mongo::Error::Parser do
         end
 
         it 'returns the message' do
-          expect(parser.message).to eq('Unknown modifier: $st (9)')
+          expect(parser.message).to eq('[9]: Unknown modifier: $st')
         end
       end
 
@@ -55,11 +70,30 @@ describe Mongo::Error::Parser do
 
         it 'returns the messages concatenated' do
           expect(parser.message).to eq(
-            'Unknown modifier: $st (9), Unknown modifier: $bl (9)'
+            'Multiple errors: 9: Unknown modifier: $st; 9: Unknown modifier: $bl'
+          )
+        end
+      end
+
+      context 'when multiple errors with code names exist' do
+
+        let(:document) do
+          {
+            'writeErrors' => [
+              { 'code' => 9, 'codeName' => 'foo', 'errmsg' => 'Unknown modifier: $st' },
+              { 'code' => 9, 'codeName' => 'foo', 'errmsg' => 'Unknown modifier: $bl' },
+            ]
+          }
+        end
+
+        it 'returns the messages concatenated' do
+          expect(parser.message).to eq(
+            'Multiple errors: [9:foo]: Unknown modifier: $st; [9:foo]: Unknown modifier: $bl'
           )
         end
       end
     end
+=end
 
     context 'when the document contains $err' do
 
@@ -68,7 +102,7 @@ describe Mongo::Error::Parser do
       end
 
       it 'returns the message' do
-        expect(parser.message).to eq('not authorized for query (13)')
+        expect(parser.message).to eq('[13]: not authorized for query')
       end
     end
 
@@ -79,7 +113,7 @@ describe Mongo::Error::Parser do
       end
 
       it 'returns the message' do
-        expect(parser.message).to eq('not authorized for query (13)')
+        expect(parser.message).to eq('[13]: not authorized for query')
       end
     end
 
@@ -90,7 +124,7 @@ describe Mongo::Error::Parser do
       end
 
       it 'returns the message' do
-        expect(parser.message).to eq('Not enough data-bearing nodes (100)')
+        expect(parser.message).to eq('[100]: Not enough data-bearing nodes')
       end
     end
   end

data/spec/mongo/error/unsupported_option_spec.rb

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

data/spec/mongo/event/publisher_spec.rb

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

data/spec/mongo/event/subscriber_spec.rb

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

data/spec/mongo/grid/file/chunk_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 require 'stringio'
 
@@ -57,7 +60,7 @@ describe Mongo::Grid::File::Chunk do
     end
 
     let(:raw_data) do
-      'testing'
+      +'testing'
     end
 
     let(:data) do
@@ -150,7 +153,7 @@ describe Mongo::Grid::File::Chunk do
     context 'when the data is smaller than the default size' do
 
       let(:raw_data) do
-        'testing'
+        +'testing'
       end
 
       let(:data) do
@@ -185,7 +188,7 @@ describe Mongo::Grid::File::Chunk do
       end
 
       let(:raw_data) do
-        'testing'
+        +'testing'
       end
 
       let(:data) do
@@ -193,7 +196,7 @@ describe Mongo::Grid::File::Chunk do
       end
 
       let(:assembled) do
-        full_data = ''
+        full_data = +''
         chunks.each do |chunk|
           full_data << chunk.data.data
         end