mongo 2.5.0.beta → 2.5.0

data/spec/mongo/uri_spec.rb

@@ -1,6 +1,45 @@
 require 'spec_helper'
 
 describe Mongo::URI do
+
+  describe '.get' do
+
+    let(:uri) { described_class.get(string) }
+
+    context 'when the scheme is mongodb://' do
+
+      let(:string) do
+        'mongodb://localhost:27017'
+      end
+
+      it 'returns a Mongo::URI object' do
+        expect(uri).to be_a(Mongo::URI)
+      end
+    end
+
+    context 'when the scheme is mongodb+srv://' do
+
+      let(:string) do
+        'mongodb+srv://test5.test.build.10gen.cc'
+      end
+
+      it 'returns a Mongo::URI::SRVProtocol object' do
+        expect(uri).to be_a(Mongo::URI::SRVProtocol)
+      end
+    end
+
+    context 'when the scheme is invalid' do
+
+      let(:string) do
+        'mongo://localhost:27017'
+      end
+
+      it 'raises an exception' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+      end
+    end
+  end
+
   let(:scheme) { 'mongodb://' }
   let(:uri) { described_class.new(string) }
 
@@ -263,7 +302,7 @@ describe Mongo::URI do
       let(:servers) { '%2Ftmp%2Fmongodb-27017.sock' }
 
       it 'returns an array with the parsed server' do
-        expect(uri.servers).to eq([servers])
+        expect(uri.servers).to eq([URI.unescape(servers)])
       end
     end
 
@@ -301,11 +340,11 @@ describe Mongo::URI do
       expect(options[:database]).to eq(TEST_DB)
     end
 
-    it 'includes the credentials in the options' do
+    it 'includes the user in the options' do
       expect(options[:user]).to eq(user)
     end
 
-    it 'includes the options in the options' do
+    it 'includes the password in the options' do
       expect(options[:password]).to eq(password)
     end
   end

data/spec/mongo/write_concern/acknowledged_spec.rb

@@ -2,6 +2,17 @@ require 'spec_helper'
 
 describe Mongo::WriteConcern::Acknowledged do
 
+  describe '#acknowledged?' do
+
+    let(:concern) do
+      described_class.new(:w => :majority)
+    end
+
+    it 'returns true' do
+      expect(concern.acknowledged?).to be(true)
+    end
+  end
+
   describe '#get_last_error' do
 
     let(:get_last_error) do

data/spec/mongo/write_concern/unacknowledged_spec.rb

@@ -12,4 +12,15 @@ describe Mongo::WriteConcern::Unacknowledged do
       expect(concern.get_last_error).to be_nil
     end
   end
+
+  describe '#acknowledged?' do
+
+    let(:concern) do
+      described_class.new(:w => 0)
+    end
+
+    it 'returns false' do
+      expect(concern.acknowledged?).to be(false)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -7,8 +7,10 @@ SERVER_SELECTION_RTT_TESTS = Dir.glob("#{CURRENT_PATH}/support/server_selection/
 SERVER_SELECTION_TESTS = Dir.glob("#{CURRENT_PATH}/support/server_selection/selection/**/*.yml")
 MAX_STALENESS_TESTS = Dir.glob("#{CURRENT_PATH}/support/max_staleness/**/*.yml")
 CRUD_TESTS = Dir.glob("#{CURRENT_PATH}/support/crud_tests/**/*.yml")
+RETRYABLE_WRITES_TESTS = Dir.glob("#{CURRENT_PATH}/support/retryable_writes_tests/**/*.yml")
 COMMAND_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/support/command_monitoring/**/*.yml")
 CONNECTION_STRING_TESTS = Dir.glob("#{CURRENT_PATH}/support/connection_string_tests/*.yml")
+DNS_SEEDLIST_DISCOVERY_TESTS = Dir.glob("#{CURRENT_PATH}/support/dns_seedlist_discovery_tests/*.yml")
 GRIDFS_TESTS = Dir.glob("#{CURRENT_PATH}/support/gridfs_tests/*.yml")
 
 if ENV['DRIVERS_TOOLS']
@@ -66,13 +68,6 @@ RSpec.configure do |config|
       # databases that will be used in the test suite.
       ADMIN_AUTHORIZED_TEST_CLIENT.database.users.create(TEST_USER)
     rescue Exception => e
-      unless write_command_enabled?
-        # If we are on versions less than 2.6, we need to create a user for
-        # each database, since the users are not stored in the admin database
-        # but in the system.users collection on the databases themselves. Also,
-        # roles in versions lower than 2.6 can only be strings, not hashes.
-        begin ADMIN_AUTHORIZED_TEST_CLIENT.database.users.create(TEST_READ_WRITE_USER); rescue; end
-      end
     end
   end
 end
@@ -144,6 +139,15 @@ end
 alias :change_stream_enabled? :op_msg_enabled?
 alias :sessions_enabled? :op_msg_enabled?
 
+
+# Whether sessions can be tested. Sessions are available on server versions 3.6
+#   and higher and when connected to a replica set or sharded cluster.
+#
+# @since 2.5.0
+def test_sessions?
+  sessions_enabled? && (replica_set? || sharded?)
+end
+
 # Whether change streams can be tested. Change streams are available on server versions 3.6
 #   and higher and when connected to a replica set.
 #
@@ -180,15 +184,6 @@ def find_command_enabled?
   $find_command_enabled ||= $mongo_client.cluster.servers.first.features.find_command_enabled?
 end
 
-# For instances where behaviour is different on different versions, we need to
-# determine in the specs if we are 2.6 or higher.
-#
-# @since 2.0.0
-def write_command_enabled?
-  $mongo_client ||= initialize_scanned_client!
-  $write_command_enabled ||= $mongo_client.cluster.servers.first.features.write_command_enabled?
-end
-
 # For instances where behaviour is different on different versions, we need to
 # determine in the specs if we are 2.7 or higher.
 #
@@ -229,15 +224,6 @@ end
 
 alias :scram_sha_1_enabled? :list_command_enabled?
 
-# Depending on whether write commands are enabled, there are different documents that
-# are guaranteed to cause a delete failure.
-#
-# @since 2.0.0
-def failing_delete_doc
-  write_command_enabled? ? { q: { '$set' => { a: 1 } }, limit: 0 } :
-                           { que: { field: 'test' } }
-end
-
 # Try running a command on the admin database to see if the mongod was started with auth.
 #
 # @since 2.2.0

data/spec/support/authorization.rb

@@ -86,7 +86,8 @@ BASE_OPTIONS = {
                   heartbeat_frequency: 20,
                   max_read_retries: 5,
                   wait_queue_timeout: 2,
-                  connect_timeout: 3
+                  connect_timeout: 3,
+                  max_idle_time: 5
                }
 
 # Options for test suite clients.

data/spec/support/connection_string.rb

@@ -156,12 +156,16 @@ module Mongo
       end
 
       def uri
-        @uri ||= Mongo::URI.new(@spec['uri'])
+        @uri ||= Mongo::URI.get(@spec['uri'])
       end
 
       def auth
         @auth ||= Auth.new(@spec['auth']) if @spec['auth']
       end
+
+      def raise_error?
+        @spec['error']
+      end
     end
 
     class Host
@@ -218,9 +222,9 @@ module Mongo
       end
 
       def match?(opts)
-        @options.keys.all? do |k|
-          opts[MAPPINGS[k]] == @options[k] ||
-              Mongo::URI::AUTH_MECH_MAP[@options[k]] == opts[MAPPINGS[k]]
+        @options.all? do |k, v|
+          opts[MAPPINGS[k.downcase]] == v ||
+              opts[MAPPINGS[k.downcase]] == Mongo::URI::AUTH_MECH_MAP[v]
         end
       end
     end

data/spec/support/crud.rb

@@ -103,29 +103,13 @@ module Mongo
       private
 
       def upper_bound_satisfied?(client)
-        if @max_server_version
-          if @max_server_version < '2.6'
-            !client.cluster.next_primary.features.write_command_enabled?
-          end
-        else
-          true
-        end
+        return true unless @max_server_version
+        client.database.command(buildInfo: 1).first['version'] <= @max_server_version
       end
 
       def lower_bound_satisfied?(client)
-        if @min_server_version
-          if @min_server_version >= '3.6'
-            client.cluster.next_primary.features.array_filters_enabled?
-          elsif @min_server_version >= '3.4'
-            client.cluster.next_primary.features.collation_enabled?
-          elsif @min_server_version >= '2.6'
-            client.cluster.next_primary.features.write_command_enabled?
-          else
-            true
-          end
-        else
-          true
-        end
+        return true unless @min_server_version
+        @min_server_version <= client.database.command(buildInfo: 1).first['version']
       end
     end
 
@@ -141,6 +125,8 @@ module Mongo
       # @since 2.0.0
       attr_reader :description
 
+      FAIL_POINT_BASE_COMMAND = { configureFailPoint: "onPrimaryTransactionalWrite" }
+
       # Instantiate the new CRUDTest.
       #
       # @example Create the test.
@@ -153,6 +139,7 @@ module Mongo
       # @since 2.0.0
       def initialize(data, test)
         @data = data
+        @fail_point_command = FAIL_POINT_BASE_COMMAND.merge(test['failPoint']) if test['failPoint']
         @description = test['description']
         @operation = Operation.get(test['operation'])
         @outcome = test['outcome']
@@ -170,11 +157,27 @@ module Mongo
       #
       # @since 2.0.0
       def run(collection)
-        @collection = collection
-        @collection.insert_many(@data)
         @operation.execute(collection)
       end
 
+      def setup_test(collection)
+        clear_fail_point(collection)
+        @collection = collection
+        collection.delete_many
+        collection.insert_many(@data)
+        set_up_fail_point(collection)
+      end
+
+      def set_up_fail_point(collection)
+        collection.client.use(:admin).command(@fail_point_command) if @fail_point_command
+      end
+
+      def clear_fail_point(collection)
+        if @fail_point_command
+          collection.client.use(:admin).command(FAIL_POINT_BASE_COMMAND.merge(mode: "off"))
+        end
+      end
+
       # The expected result of running the test.
       #
       # @example Get the expected result of running the test.
@@ -241,6 +244,10 @@ module Mongo
         @outcome['collection']['data'] if @outcome['collection']
       end
 
+      def error?
+        !!@outcome['error']
+      end
+
       private
 
       def compare_result(expected, actual)
@@ -248,8 +255,9 @@ module Mongo
           when nil
             actual.nil?
           when Hash
-            actual.all? do |k, v|
-              expected[k] == v || handle_upserted_id(k, expected[k], v)
+            results = actual.instance_variable_get(:@results)
+            (results || actual).all? do |k, v|
+              expected[k] == v || handle_upserted_id(k, expected[k], v) || handle_inserted_ids(k, expected[k], v)
             end
           when Integer
             expected == actual
@@ -265,6 +273,12 @@ module Mongo
         end
       end
 
+      def handle_inserted_ids(field, expected, actual)
+        if field == 'insertedIds'
+          expected.values == actual
+        end
+      end
+
       def actual_collection_data
         if @outcome['collection']
           collection_name = @outcome['collection']['name'] || @collection.name

data/spec/support/crud/write.rb

@@ -99,7 +99,15 @@ module Mongo
         private
 
         def bulk_write(collection)
-          collection.bulk_write(requests, options)
+          result = collection.bulk_write(requests, options)
+          return_doc = {}
+          return_doc['deletedCount'] = result.deleted_count if result.deleted_count
+          return_doc['insertedIds'] = result.inserted_ids if result.inserted_ids
+          return_doc['upsertedId'] = result.upserted_id if upsert
+          return_doc['upsertedCount'] = result.upserted_count if result.upserted_count
+          return_doc['matchedCount'] = result.matched_count if result.matched_count
+          return_doc['modifiedCount'] = result.modified_count if result.modified_count
+          return_doc
         end
 
         def delete_many(collection)
@@ -211,17 +219,36 @@ module Mongo
               { insert_one: request['insertOne']['document'] }
             when 'updateOne' then
               update = request['updateOne']
-              { update_one: { filter: update['filter'], update: update['update'] }}
+              { update_one: { filter: update['filter'], update: update['update'] } }
+            when 'name' then
+              bulk_request(request)
             end
           end
         end
 
+        def bulk_request(request)
+          op_name = OPERATIONS[request['name']]
+          op = { op_name => {} }
+          op[op_name].merge!(filter: request['arguments']['filter']) if request['arguments']['filter']
+          op[op_name].merge!(update: request['arguments']['update']) if request['arguments']['update']
+          op[op_name].merge!(upsert: request['arguments']['upsert']) if request['arguments']['upsert']
+          op[op_name].merge!(replacement: request['arguments']['replacement']) if request['arguments']['replacement']
+          op[op_name].merge!(array_filters: request['arguments']['arrayFilters']) if request['arguments']['arrayFilters']
+          op[op_name] = request['arguments']['document'] if request['arguments']['document']
+          op
+        end
+
         def upsert
           arguments['upsert']
         end
 
         def return_document
-          :after if arguments['returnDocument']
+          case arguments['returnDocument']
+          when 'Before'
+            :before
+          when 'After'
+            :after
+          end
         end
 
         def update

data/spec/support/crud_tests/read/aggregate-out.yml

@@ -26,3 +26,24 @@ tests:
                 data:
                     - {_id: 2, x: 22}
                     - {_id: 3, x: 33}
+    -
+        description: "Aggregate with $out and batch size of 0"
+        operation:
+            name: aggregate
+            arguments:
+                pipeline:
+                    - $sort: {x: 1}
+                    - $match:
+                        _id: {$gt: 1}
+                    - $out: "other_test_collection"
+                batchSize: 0
+
+        outcome:
+            result:
+                - {_id: 2, x: 22}
+                - {_id: 3, x: 33}
+            collection:
+                name: "other_test_collection"
+                data:
+                    - {_id: 2, x: 22}
+                    - {_id: 3, x: 33}

data/spec/support/crud_tests/write/bulkWrite-arrayFilters.yml

@@ -0,0 +1,44 @@
+data:
+    - {_id: 1, y: [{b: 3}, {b: 1}]}
+    - {_id: 2, y: [{b: 0}, {b: 1}]}
+
+minServerVersion: '3.5.6'
+
+tests:
+    -
+        description: "BulkWrite with arrayFilters"
+        operation:
+            name: "bulkWrite"
+            arguments:
+                requests:
+                    -
+                        # UpdateOne when one document matches arrayFilters
+                        name: "updateOne"
+                        arguments:
+                            filter: {}
+                            update:
+                                $set: {"y.$[i].b": 2}
+                            arrayFilters:
+                              - {i.b: 3}
+                    -
+                        # UpdateMany when multiple documents match arrayFilters
+                        name: "updateMany"
+                        arguments:
+                            filter: {}
+                            update:
+                                $set: {"y.$[i].b": 2}
+                            arrayFilters:
+                              - {i.b: 1}
+                options: { ordered: true }
+        outcome:
+            result:
+                deletedCount: 0
+                insertedIds: {}
+                matchedCount: 3
+                modifiedCount: 3
+                upsertedCount: 0
+                upsertedIds: {}
+            collection:
+                data:
+                    - {_id: 1, y: [{b: 2}, {b: 2}]}
+                    - {_id: 2, y: [{b: 0}, {b: 2}]}