mongo 2.5.1 → 2.5.2

data/spec/mongo/operation/{write/command/update_user_spec.rb → update_user_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Write::Command::UpdateUser do
+describe Mongo::Operation::UpdateUser do
 
   describe '#execute' do
 

data/spec/mongo/server/connection_spec.rb

@@ -45,28 +45,6 @@ describe Mongo::Server::Connection do
     server.disconnect!
   end
 
-  describe '#connectable?' do
-
-    context 'when the connection is not connectable' do
-
-      let(:bad_address) do
-        Mongo::Address.new('127.0.0.1:666')
-      end
-
-      let(:bad_server) do
-        Mongo::Server.new(bad_address, cluster, monitoring, listeners, TEST_OPTIONS)
-      end
-
-      let(:connection) do
-        described_class.new(bad_server)
-      end
-
-      it 'returns false' do
-        expect(connection).to_not be_connectable
-      end
-    end
-  end
-
   describe '#connect!' do
 
     context 'when no socket exists' do

data/spec/mongo/server_selector_spec.rb

@@ -30,6 +30,17 @@ describe Mongo::ServerSelector do
       it 'returns a read preference of class Primary' do
         expect(selector).to be_a(Mongo::ServerSelector::Primary)
       end
+
+      context 'when the mode is a string' do
+
+        let(:name) do
+          'primary'
+        end
+
+        it 'returns a read preference of class Primary' do
+          expect(selector).to be_a(Mongo::ServerSelector::Primary)
+        end
+      end
     end
 
     context 'when the mode is primary_preferred' do
@@ -40,6 +51,17 @@ describe Mongo::ServerSelector do
       it 'returns a read preference of class PrimaryPreferred' do
         expect(selector).to be_a(Mongo::ServerSelector::PrimaryPreferred)
       end
+
+      context 'when the mode is a string' do
+
+        let(:name) do
+          'primary_preferred'
+        end
+
+        it 'returns a read preference of class PrimaryPreferred' do
+          expect(selector).to be_a(Mongo::ServerSelector::PrimaryPreferred)
+        end
+      end
     end
 
     context 'when the mode is secondary' do
@@ -50,6 +72,17 @@ describe Mongo::ServerSelector do
       it 'returns a read preference of class Secondary' do
         expect(selector).to be_a(Mongo::ServerSelector::Secondary)
       end
+
+      context 'when the mode is a string' do
+
+        let(:name) do
+          'secondary'
+        end
+
+        it 'returns a read preference of class Secondary' do
+          expect(selector).to be_a(Mongo::ServerSelector::Secondary)
+        end
+      end
     end
 
     context 'when the mode is secondary_preferred' do
@@ -60,6 +93,17 @@ describe Mongo::ServerSelector do
       it 'returns a read preference of class SecondaryPreferred' do
         expect(selector).to be_a(Mongo::ServerSelector::SecondaryPreferred)
       end
+
+      context 'when the mode is a string' do
+
+        let(:name) do
+          'secondary_preferred'
+        end
+
+        it 'returns a read preference of class SecondaryPreferred' do
+          expect(selector).to be_a(Mongo::ServerSelector::SecondaryPreferred)
+        end
+      end
     end
 
     context 'when the mode is nearest' do
@@ -70,6 +114,17 @@ describe Mongo::ServerSelector do
       it 'returns a read preference of class Nearest' do
         expect(selector).to be_a(Mongo::ServerSelector::Nearest)
       end
+
+      context 'when the mode is a string' do
+
+        let(:name) do
+          'nearest'
+        end
+
+        it 'returns a read preference of class Nearest' do
+          expect(selector).to be_a(Mongo::ServerSelector::Nearest)
+        end
+      end
     end
 
     context 'when a mode is not provided' do

data/spec/mongo/server_spec.rb

@@ -81,48 +81,6 @@ describe Mongo::Server do
     end
   end
 
-  describe '#connectable?' do
-
-    context 'when the server is connectable' do
-
-      let(:server) do
-        described_class.new(address, cluster, monitoring, listeners, TEST_OPTIONS)
-      end
-
-      after do
-        server.disconnect!
-      end
-
-      before do
-        expect(cluster).to receive(:pool).with(server).and_return(pool)
-      end
-
-      it 'returns true' do
-        expect(server).to be_connectable
-      end
-    end
-
-    context 'when the server is not connectable' do
-
-      let(:bad_address) do
-        Mongo::Address.new('127.0.0.1:666')
-      end
-
-      let(:server) do
-        described_class.new(bad_address, cluster, monitoring, listeners, TEST_OPTIONS)
-      end
-
-      before do
-        expect(cluster).to receive(:pool).with(server).and_return(pool)
-        server.disconnect!
-      end
-
-      it 'returns false' do
-        expect(server).to_not be_connectable
-      end
-    end
-  end
-
   describe '#disconnect!' do
 
     let(:server) do

data/spec/mongo/session/session_pool_spec.rb

@@ -206,7 +206,7 @@ describe Mongo::Session::SessionPool, if: test_sessions? do
           queue << double('session', session_id: id)
         end
         pool.instance_variable_set(:@queue, queue)
-        expect(Mongo::Operation::Commands::Command).to receive(:new).at_least(:twice).and_call_original
+        expect(Mongo::Operation::Command).to receive(:new).at_least(:twice).and_call_original
       end
 
       let(:end_sessions_commands) do

data/spec/mongo/uri/srv_protocol_spec.rb

@@ -896,10 +896,10 @@ describe Mongo::URI::SRVProtocol do
       end
 
       context 'when an app name option is provided' do
-        let(:options) { "appname=reports" }
+        let(:options) { "appname=srv_test" }
 
         it 'sets the app name on the client' do
-          expect(Mongo::Client.new(string).options[:app_name]).to eq(:reports)
+          expect(Mongo::Client.new(string).options[:app_name]).to eq(:srv_test)
         end
       end
 

data/spec/mongo/uri_spec.rb

@@ -962,10 +962,10 @@ describe Mongo::URI do
     end
 
     context 'when an app name option is provided' do
-      let(:options) { "appname=reports" }
+      let(:options) { "appname=uri_test" }
 
       it 'sets the app name on the client' do
-        expect(Mongo::Client.new(string).options[:app_name]).to eq(:reports)
+        expect(Mongo::Client.new(string).options[:app_name]).to eq(:uri_test)
       end
     end
 

data/spec/support/gridfs_tests/delete.yml

@@ -40,24 +40,11 @@ data:
             contentType: "application/octet-stream"
             aliases: []
             metadata: {}
-        -
-            _id: { "$oid" : "000000000000000000000005" }
-            length: 8
-            chunkSize: 4
-            uploadDate: { "$date" : "1970-01-01T00:00:00.000Z" }
-            md5: "dd254cdc958e53abaa67da9f797125f5"
-            filename: "length-8-with-empty-chunk"
-            contentType: "application/octet-stream"
-            aliases: []
-            metadata: {}
     chunks:
         - { _id : { "$oid" : "000000000000000000000001" }, files_id : { "$oid" : "000000000000000000000002" }, n : 0, data : { $hex : "" } }
         - { _id : { "$oid" : "000000000000000000000002" }, files_id : { "$oid" : "000000000000000000000003" }, n : 0, data : { $hex : "1122" } }
         - { _id : { "$oid" : "000000000000000000000003" }, files_id : { "$oid" : "000000000000000000000004" }, n : 0, data : { $hex : "11223344" } }
         - { _id : { "$oid" : "000000000000000000000004" }, files_id : { "$oid" : "000000000000000000000004" }, n : 1, data : { $hex : "55667788" } }
-        - { _id : { "$oid" : "000000000000000000000005" }, files_id : { "$oid" : "000000000000000000000005" }, n : 0, data : { $hex : "11223344" } }
-        - { _id : { "$oid" : "000000000000000000000006" }, files_id : { "$oid" : "000000000000000000000005" }, n : 1, data : { $hex : "55667788" } }
-        - { _id : { "$oid" : "000000000000000000000007" }, files_id : { "$oid" : "000000000000000000000005" }, n : 2, data : { $hex : "" } }
 
 tests:
     -
@@ -72,7 +59,7 @@ tests:
                 -
                     { delete : "expected.files", deletes : [
                         { q : { _id : { "$oid" : "000000000000000000000001" } }, limit : 1 }
-                    ] }                           
+                    ] }
     -
         description: "Delete when length is 0 and there is one extra empty chunk"
         act:
@@ -107,23 +94,6 @@ tests:
                     { delete : "expected.chunks", deletes : [
                         { q : { files_id : { "$oid" : "000000000000000000000004" } }, limit : 0 }
                     ] }
-    -
-        description: "Delete when length is 8 and there is one extra empty chunk"
-        act:
-            operation: delete
-            arguments:
-                id: { "$oid" : "000000000000000000000005" }
-        assert:
-            result: void
-            data:
-                -
-                    { delete : "expected.files", deletes : [
-                        { q : { _id : { "$oid" : "000000000000000000000005" } }, limit : 1 }
-                    ] }
-                -
-                    { delete : "expected.chunks", deletes : [
-                        { q : { files_id : { "$oid" : "000000000000000000000005" } }, limit : 0 }
-                    ] }
     -
         description: "Delete when files entry does not exist"
         act:
@@ -138,20 +108,16 @@ tests:
             data:
                 -
                     { delete : "fs.files", deletes : [
-                        { q : { _id : { "$oid" : "000000000000000000000005" } }, limit : 1 }
+                        { q : { _id : { "$oid" : "000000000000000000000004" } }, limit : 1 }
                     ] }
         act:
             operation: delete
             arguments:
-                id: { "$oid" : "000000000000000000000005" }
+                id: { "$oid" : "000000000000000000000004" }
         assert:
             error: "FileNotFound"
             data:
                 -
                     { delete : "expected.files", deletes : [
-                        { q : { _id : { "$oid" : "000000000000000000000005" } }, limit : 1 }
-                    ] }
-                -
-                    { delete : "expected.chunks", deletes : [
-                        { q : { files_id : { "$oid" : "000000000000000000000005" } }, limit : 0 }
+                        { q : { _id : { "$oid" : "000000000000000000000004" } }, limit : 1 }
                     ] }

data/spec/support/gridfs_tests/download.yml

@@ -52,11 +52,10 @@ data:
             metadata: {}
         -
             _id: { "$oid" : "000000000000000000000006" }
-            length: 12
+            length: 2
             chunkSize: 4
             uploadDate: { "$date" : "1970-01-01T00:00:00.000Z" }
-            md5: "6289ac1db331d1c7677a4b7e123178f9"
-            filename: "length-12-with-empty-chunk"
+            md5: "c700ed4fdb1d27055aa3faa2c2432283"
             contentType: "application/octet-stream"
             aliases: []
             metadata: {}
@@ -68,10 +67,7 @@ data:
         - { _id : { "$oid" : "000000000000000000000005" }, files_id : { "$oid" : "000000000000000000000005" }, n : 0, data : { $hex : "11223344" } }
         - { _id : { "$oid" : "000000000000000000000006" }, files_id : { "$oid" : "000000000000000000000005" }, n : 1, data : { $hex : "55667788" } }
         - { _id : { "$oid" : "000000000000000000000007" }, files_id : { "$oid" : "000000000000000000000005" }, n : 2, data : { $hex : "99aa" } }
-        - { _id : { "$oid" : "000000000000000000000008" }, files_id : { "$oid" : "000000000000000000000006" }, n : 0, data : { $hex : "11223344" } }
-        - { _id : { "$oid" : "000000000000000000000009" }, files_id : { "$oid" : "000000000000000000000006" }, n : 1, data : { $hex : "55667788" } }
-        - { _id : { "$oid" : "000000000000000000000010" }, files_id : { "$oid" : "000000000000000000000006" }, n : 2, data : { $hex : "99aabbcc" } }
-        - { _id : { "$oid" : "000000000000000000000011" }, files_id : { "$oid" : "000000000000000000000006" }, n : 3, data : { $hex : "" } }
+        - { _id : { "$oid" : "000000000000000000000008" }, files_id : { "$oid" : "000000000000000000000006" }, n : 0, data : { $hex : "1122" } }
 
 tests:
     -
@@ -119,15 +115,6 @@ tests:
                 options: { }
         assert:
             result: { $hex : "112233445566778899aa" }
-    -
-        description: "Download when there are three chunks and one extra empty chunk at the end"
-        act:
-            operation: download
-            arguments:
-                id: { "$oid" : "000000000000000000000006" }
-                options: { }
-        assert:
-            result: { $hex : "112233445566778899aabbcc" }
     -
         description: "Download when files entry does not exist"
         act:
@@ -165,20 +152,6 @@ tests:
                 id: { "$oid" : "000000000000000000000005" }
         assert:
             error: "ChunkIsMissing"
-    -
-        description: "Download when there is an extra chunk"
-        arrange:
-            data:
-                -
-                    { insert : "fs.chunks", documents : [
-                        { _id : { "$oid" : "000000000000000000000012" }, files_id : { "$oid" : "000000000000000000000004" }, n : 2, data : { $hex : "99" } }
-                    ] }
-        act:
-            operation: download
-            arguments:
-                id: { "$oid" : "000000000000000000000004" }
-        assert:
-            error: "ExtraChunk"
     -
         description: "Download when an intermediate chunk is the wrong size"
         arrange:
@@ -208,3 +181,12 @@ tests:
                 id: { "$oid" : "000000000000000000000005" }
         assert:
             error: "ChunkIsWrongSize"
+    -
+        description: "Download legacy file with no name"
+        act:
+            operation: download
+            arguments:
+                id: { "$oid" : "000000000000000000000006" }
+                options: { }
+        assert:
+            result: { $hex : "1122" }

data/spec/support/server_selection.rb

@@ -149,7 +149,7 @@ module Mongo
         #
         # @since 2.0.0
         def candidate_servers
-          @candidate_servers.select { |s| s['type'] != 'Unknown' }
+          @candidate_servers.select { |s| !['Unknown', 'PossiblePrimary'].include?(s['type']) }
         end
 
         private

data/spec/support/server_selection/selection/ReplicaSetNoPrimary/read/Nearest.yml

@@ -1,4 +1,3 @@
----
 topology_description:
   type: ReplicaSetNoPrimary
   servers:

data/spec/support/server_selection/selection/ReplicaSetNoPrimary/read/Nearest_multiple.yml

@@ -1,4 +1,3 @@
----
 topology_description:
   type: ReplicaSetNoPrimary
   servers:

data/spec/support/server_selection/selection/ReplicaSetNoPrimary/read/Nearest_non_matching.yml

@@ -1,4 +1,3 @@
----
 topology_description:
   type: ReplicaSetNoPrimary
   servers:

data/spec/support/server_selection/selection/ReplicaSetNoPrimary/read/PossiblePrimary.yml

@@ -0,0 +1,15 @@
+# Test that PossiblePrimary isn't candidate for any read preference mode.
+---
+topology_description:
+  type: ReplicaSetNoPrimary
+  servers:
+  - address: b:27017
+    avg_rtt_ms: 5
+    type: PossiblePrimary
+operation: read
+read_preference:
+  mode: Primary
+  tag_sets:
+  - {}
+suitable_servers: []
+in_latency_window: []

data/spec/support/server_selection/selection/ReplicaSetNoPrimary/read/PossiblePrimaryNearest.yml

@@ -0,0 +1,15 @@
+# Test that PossiblePrimary isn't candidate for any read preference mode.
+---
+topology_description:
+  type: ReplicaSetNoPrimary
+  servers:
+  - address: b:27017
+    avg_rtt_ms: 5
+    type: PossiblePrimary
+operation: read
+read_preference:
+  mode: Nearest
+  tag_sets:
+  - {}
+suitable_servers: []
+in_latency_window: []

data/spec/support/server_selection/selection/ReplicaSetNoPrimary/read/Primary.yml

@@ -1,4 +1,3 @@
----
 topology_description:
   type: ReplicaSetNoPrimary
   servers:
@@ -15,7 +14,5 @@ topology_description:
 operation: read
 read_preference:
   mode: Primary
-  tag_sets:
-  - {}
 suitable_servers: []
 in_latency_window: []

data/spec/support/server_selection/selection/ReplicaSetNoPrimary/read/PrimaryPreferred.yml

@@ -1,4 +1,3 @@
----
 topology_description:
   type: ReplicaSetNoPrimary
   servers: