mongo 2.15.0.alpha → 2.15.0

data/spec/mongo/database_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Database do
@@ -653,18 +656,18 @@ describe Mongo::Database do
     end
 
     it 'sends the query command to the cluster' do
-      expect(database.command(:ismaster => 1).written_count).to eq(0)
+      expect(database.command(:ping => 1).written_count).to eq(0)
     end
 
     it 'does not mutate the command selector' do
-      expect(database.command({:ismaster => 1}.freeze).written_count).to eq(0)
+      expect(database.command({:ping => 1}.freeze).written_count).to eq(0)
     end
 
     context 'when provided a session' do
       min_server_fcv '3.6'
 
       let(:operation) do
-        client.database.command({ :ismaster => 1 }, session: session)
+        client.database.command({ :ping => 1 }, session: session)
       end
 
       let(:failed_operation) do
@@ -688,7 +691,7 @@ describe Mongo::Database do
 
 
       let(:full_command) do
-        subscriber.started_events.find { |cmd| cmd.command_name == 'ismaster' }.command
+        subscriber.started_events.find { |cmd| cmd.command_name == 'ping' }.command
       end
 
       it 'does not add a afterClusterTime field' do
@@ -706,7 +709,7 @@ describe Mongo::Database do
 
         it 'sends the read concern' do
           expect {
-            database.command(:ismaster => 1, readConcern: { level: 'local' })
+            database.command(:ping => 1, readConcern: { level: 'local' })
           }.to_not raise_error
         end
       end
@@ -716,7 +719,7 @@ describe Mongo::Database do
 
         it 'raises an exception' do
           expect {
-            database.command(:ismaster => 1, readConcern: { level: 'yay' })
+            database.command(:ping => 1, readConcern: { level: 'yay' })
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end

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

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

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

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

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

data/spec/mongo/grid/file_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Grid::File do
@@ -44,7 +47,7 @@ describe Mongo::Grid::File do
     end
 
     let(:data) do
-      'testing'
+      +'testing'
     end
 
     before do

data/spec/mongo/grid/fs_bucket_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Grid::FSBucket do
@@ -64,12 +67,25 @@ describe Mongo::Grid::FSBucket do
 
       context 'when a read preference is set' do
 
-        let(:options) do
-          { read: { mode: :secondary } }
+        context 'when given as a hash with symbol keys' do
+          let(:options) do
+            { read: { mode: :secondary } }
+          end
+
+          it 'returns the read preference as a BSON::Document' do
+            expect(fs.send(:read_preference)).to be_a(BSON::Document)
+            expect(fs.send(:read_preference)).to eq('mode' => :secondary)
+          end
         end
 
-        it 'sets the read preference' do
-          expect(fs.send(:read_preference)).to eq(options[:read])
+        context 'when given as a BSON::Document' do
+          let(:options) do
+            BSON::Document.new(read: { mode: :secondary })
+          end
+
+          it 'returns the read preference as set' do
+            expect(fs.send(:read_preference)).to eq(options[:read])
+          end
         end
       end
 
@@ -721,7 +737,8 @@ describe Mongo::Grid::FSBucket do
       end
 
       it 'sets the read preference on the Stream::Read object' do
-        expect(stream.read_preference).to eq(options[:read])
+        expect(stream.read_preference).to be_a(BSON::Document)
+        expect(stream.read_preference).to eq(BSON::Document.new(options[:read]))
       end
     end