mongo 2.8.0 → 2.9.0.rc0

data/spec/mongo/uri_spec.rb

@@ -208,12 +208,12 @@ describe Mongo::URI do
       end
     end
 
-    context 'mongodb://example.com?w=1' do
+    context 'no slash after hosts, and options' do
 
-      let(:string) { 'mongodb://example.com?w=1' }
+      let(:string) { 'mongodb://example.com?tls=true' }
 
       it 'raises an error' do
-        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI, %r,MongoDB URI must have a slash \(/\) after the hosts if options are given,)
       end
     end
 
@@ -222,7 +222,43 @@ describe Mongo::URI do
       let(:string) { 'mongodb://example.com/?w' }
 
       it 'raises an error' do
-        expect { uri }.to raise_error(Mongo::Error::InvalidURI)
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI, /Option w has no value/)
+      end
+    end
+
+    context 'equal sign in option value' do
+
+      let(:string) { 'mongodb://example.com/?w=a=b' }
+
+      it 'raises an error' do
+        expect { uri }.to raise_error(Mongo::Error::InvalidURI, %r,Value for option w contains the key/value delimiter \(=\): a=b,)
+      end
+    end
+
+    context 'slash in option value' do
+
+      let(:string) { 'mongodb://example.com/?tlsCAFile=a/b' }
+
+      it 'returns a Mongo::URI object' do
+        expect(uri).to be_a(Mongo::URI)
+      end
+
+      it 'parses correctly' do
+        expect(uri.servers).to eq(['example.com'])
+        expect(uri.uri_options[:ssl_ca_cert]).to eq('a/b')
+      end
+    end
+
+    context 'numeric value in a string option' do
+
+      let(:string) { 'mongodb://example.com/?appName=1' }
+
+      it 'returns a Mongo::URI object' do
+        expect(uri).to be_a(Mongo::URI)
+      end
+
+      it 'sets option to the string value' do
+        expect(uri.uri_options[:app_name]).to eq('1')
       end
     end
 
@@ -462,7 +498,7 @@ describe Mongo::URI do
       context 'wtimeoutMS' do
         let(:timeout) { 1234 }
         let(:options) { "w=2&wtimeoutMS=#{timeout}" }
-        let(:concern) { Mongo::Options::Redacted.new(:w => 2, :timeout => timeout) }
+        let(:concern) { Mongo::Options::Redacted.new(:w => 2, :wtimeout => timeout) }
 
         it 'sets the write concern options' do
           expect(uri.uri_options[:write]).to eq(concern)
@@ -1000,7 +1036,7 @@ describe Mongo::URI do
 
       it 'sets the app name on the client' do
         client = new_local_client_nmio(string)
-        expect(client.options[:app_name]).to eq(:uri_test)
+        expect(client.options[:app_name]).to eq('uri_test')
       end
     end
 

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ require 'support/authorization'
 require 'support/primary_socket'
 require 'support/constraints'
 require 'support/cluster_config'
+require 'support/cluster_tools'
 require 'rspec/retry'
 require 'support/monitoring_ext'
 
@@ -23,89 +24,5 @@ RSpec.configure do |config|
   end
 end
 
-# Determine whether the test clients are connecting to a sharded cluster
-# or a single mongos.
-#
-# @since 2.0.0
-def sharded?
-  $mongo_client ||= initialize_scanned_client!
-  $sharded ||= ($mongo_client.cluster.sharded? || single_mongos?)
-end
-
-# Determine whether the single address provided is a replica set member.
-# @note To run the specs relying on this to return true,
-#   start a replica set and set the environment variable
-#   MONGODB_ADDRESSES to the address of a single member.
-#
-# @since 2.0.0
-def single_rs_member?
-  ClusterConfig.instance.single_server? && ClusterConfig.instance.replica_set_name
-end
-
-# Determine whether the single address provided is a mongos.
-# @note To run the specs relying on this to return true,
-#   start a sharded cluster and set the environment variable
-#   MONGODB_ADDRESSES to the address of a single mongos.
-#
-# @since 2.0.0
-def single_mongos?
-  ClusterConfig.instance.single_server? && ClusterConfig.instance.mongos?
-end
-
-# For instances where behavior is different on different versions, we need to
-# determine in the specs if we are 3.2 or higher.
-#
-# @since 2.0.0
-def find_command_enabled?
-  $find_command_enabled ||= scanned_client_server!.features.find_command_enabled?
-end
-
-# For instances where behavior is different on different versions, we need to
-# determine in the specs if we are 4.0 or higher.
-#
-# @since 2.6.0
-def scram_sha_256_enabled?
-  $scram_sha_256_enabled ||= scanned_client_server!.features.scram_sha_256_enabled?
-end
-
-# Initializes a basic scanned client to do an ismaster check.
-#
-# @since 2.0.0
-def initialize_scanned_client!
-  ClientRegistry.instance.global_client('basic')
-end
-
-class ScannedClientHasNoServers < StandardError; end
-
-def scanned_client_server!
-  $mongo_client ||= initialize_scanned_client!
-  server = $mongo_client.cluster.servers.first
-  if server.nil?
-    raise ScannedClientHasNoServers
-  end
-  server
-end
-
-# Converts a 'camelCase' string or symbol to a :snake_case symbol.
-def camel_to_snake(ident)
-  ident = ident.is_a?(String) ? ident.dup : ident.to_s
-  ident[0] = ident[0].downcase
-  ident.chars.reduce('') { |s, c| s + (/[A-Z]/ =~ c ? "_#{c.downcase}" : c) }.to_sym
-end
-
-# Creates a copy of a hash where all keys and string values are converted to snake-case symbols.
-# For example, `{ 'fooBar' => { 'baz' => 'bingBing', :x => 1 } }` converts to
-# `{ :foo_bar => { :baz => :bing_bing, :x => 1 } }`.
-def snakeize_hash(value)
-  return camel_to_snake(value) if value.is_a?(String)
-  return value unless value.is_a?(Hash)
-
-  value.reduce({}) do |hash, kv|
-    hash.tap do |h|
-      h[camel_to_snake(kv.first)] = snakeize_hash(kv.last)
-    end
-  end
-end
-
 # require all shared examples
 Dir['./spec/support/shared/*.rb'].sort.each { |file| require file }

data/spec/spec_tests/cmap_spec.rb

@@ -0,0 +1,50 @@
+require 'lite_spec_helper'
+
+describe 'Cmap' do
+
+  declare_topology_double
+
+  let(:cluster) do
+    double('cluster').tap do |cl|
+      allow(cl).to receive(:topology).and_return(topology)
+      allow(cl).to receive(:options).and_return({})
+    end
+  end
+
+  CMAP_TESTS.sort.each do |file|
+    spec = Mongo::Cmap::Spec.new(file)
+
+    context("#{spec.description} (#{file.sub(%r'.*/data/cmap/', '')})") do
+      before do
+        spec.setup(cluster)
+      end
+
+      let!(:result) do
+        mock_socket = double('socket')
+        allow(mock_socket).to receive(:close)
+        allow_any_instance_of(Mongo::Server::Connection).to receive(:do_connect).and_return(mock_socket)
+        spec.run
+      end
+
+      let(:verifier) do
+        Mongo::Cmap::Verifier.new(spec)
+      end
+
+      it 'raises the correct error' do
+        expect(result['error']).to eq(spec.expected_error)
+      end
+
+      let(:actual_events) { result['events'].freeze }
+
+      it 'emits the correct number of events' do
+        expect(actual_events.length).to eq(spec.expected_events.length)
+      end
+
+      spec.expected_events.each_with_index do |expected_event, index|
+        it "emits correct event #{index+1}" do
+          verifier.verify_hashes(actual_events[index], expected_event)
+        end
+      end
+    end
+  end
+end

data/spec/spec_tests/command_monitoring_spec.rb

@@ -1,26 +1,21 @@
 require 'spec_helper'
 
-def ignore?(test)
-  if version = test.ignore_if_server_version_greater_than
-    return true if version == "3.0" && find_command_enabled?
-  end
-  if version = test.ignore_if_server_version_less_than
-    return true if version == "3.1" && !find_command_enabled?
-  end
-  false
-end
-
 describe 'Command Monitoring Events' do
 
   COMMAND_MONITORING_TESTS.each do |file|
 
-
     spec = Mongo::CommandMonitoring::Spec.new(file)
 
     spec.tests.each do |test|
-
       context(test.description) do
 
+        if test.min_server_fcv
+          min_server_fcv test.min_server_fcv
+        end
+        if test.max_server_version
+          max_server_version test.max_server_version
+        end
+
         let(:subscriber) do
           Mongo::CommandMonitoring::TestSubscriber.new
         end
@@ -41,12 +36,6 @@ describe 'Command Monitoring Events' do
 
         test.expectations.each do |expectation|
 
-          before do
-            if ignore?(test)
-              skip 'Preconditions not met'
-            end
-          end
-
           it "generates a #{expectation.event_name} for #{expectation.command_name}" do
             begin
               test.run(authorized_collection)

data/spec/spec_tests/crud_spec.rb

@@ -1,53 +1,7 @@
 require 'spec_helper'
 
-describe 'CRUD' do
-
-  CRUD_TESTS.each do |file|
-
-    spec = Mongo::CRUD::Spec.new(file)
-
-    context(spec.description) do
-
-      spec.tests.each do |test|
-
-        context(test.description) do
-
-          before(:each) do
-            unless spec.server_version_satisfied?(authorized_client)
-              skip 'Version requirement not satisfied'
-            end
-
-            test.setup_test(authorized_collection)
-          end
-
-          after(:each) do
-            authorized_collection.delete_many
-          end
-
-          let!(:results) do
-            test.run(authorized_collection)
-          end
-
-          let(:verifier) { Mongo::CRUD::Verifier.new(test) }
-
-          let(:actual_collection) do
-            if test.outcome['collection'] && test.outcome['collection']['name']
-              authorized_client[test.outcome['collection']['name']]
-            else
-              authorized_collection
-            end
-          end
-
-          it 'returns the correct result' do
-            verifier.verify_operation_result(results)
-          end
-
-          it 'has the correct data in the collection', if: test.outcome_collection_data do
-            results
-            verifier.verify_collection_data(actual_collection.find.to_a)
-          end
-        end
-      end
-    end
+describe do
+  define_crud_spec_tests('CRUD spec tests', CRUD_TESTS.sort) do |spec, req, test|
+    let(:client) { authorized_client }
   end
 end

data/spec/spec_tests/data/cmap/connection-must-have-id.yml

@@ -0,0 +1,21 @@
+version: 1
+style: unit
+description: must have an ID number associated with it
+operations:
+  - name: checkOut
+  - name: checkOut
+events:
+  - type: ConnectionCheckOutStarted
+  - type: ConnectionCreated
+    connectionId: 42
+  - type: ConnectionCheckedOut
+    connectionId: 42
+  - type: ConnectionCheckOutStarted
+  - type: ConnectionCreated
+    connectionId: 42
+  - type: ConnectionCheckedOut
+    connectionId: 42
+ignore:
+  - ConnectionPoolCreated
+  - ConnectionPoolClosed
+  - ConnectionReady

data/spec/spec_tests/data/cmap/connection-must-order-ids.yml

@@ -0,0 +1,21 @@
+version: 1
+style: unit
+description: must have IDs assigned in order of creation
+operations:
+  - name: checkOut
+  - name: checkOut
+events:
+  - type: ConnectionCheckOutStarted
+  - type: ConnectionCreated
+    connectionId: 1
+  - type: ConnectionCheckedOut
+    connectionId: 1
+  - type: ConnectionCheckOutStarted
+  - type: ConnectionCreated
+    connectionId: 2
+  - type: ConnectionCheckedOut
+    connectionId: 2
+ignore:
+  - ConnectionPoolCreated
+  - ConnectionPoolClosed
+  - ConnectionReady

data/spec/spec_tests/data/cmap/pool-checkin-destroy-closed.yml

@@ -0,0 +1,24 @@
+version: 1
+style: unit
+description: must destroy checked in connection if pool has been closed
+operations:
+  - name: checkOut
+    label: conn
+  - name: close
+  - name: checkIn
+    connection: conn
+events:
+  - type: ConnectionCheckedOut
+    connectionId: 1
+  - type: ConnectionPoolClosed
+    address: 42
+  - type: ConnectionCheckedIn
+    connectionId: 1
+  - type: ConnectionClosed
+    connectionId: 1
+    reason: poolClosed
+ignore:
+  - ConnectionPoolCreated
+  - ConnectionCreated
+  - ConnectionReady
+  - ConnectionCheckOutStarted

data/spec/spec_tests/data/cmap/pool-checkin-destroy-stale.yml

@@ -0,0 +1,24 @@
+version: 1
+style: unit
+description: must destroy checked in connection if it is stale
+operations:
+  - name: checkOut
+    label: conn
+  - name: clear
+  - name: checkIn
+    connection: conn
+events:
+  - type: ConnectionCheckedOut
+    connectionId: 1
+  - type: ConnectionPoolCleared
+    address: 42
+  - type: ConnectionCheckedIn
+    connectionId: 1
+  - type: ConnectionClosed
+    connectionId: 1
+    reason: stale
+ignore:
+  - ConnectionPoolCreated
+  - ConnectionCreated
+  - ConnectionReady
+  - ConnectionCheckOutStarted

data/spec/spec_tests/data/cmap/pool-checkin-make-available.yml

@@ -0,0 +1,21 @@
+version: 1
+style: unit
+description: must make valid checked in connection available
+operations:
+  - name: checkOut
+    label: conn
+  - name: checkIn
+    connection: conn
+  - name: checkOut
+events:
+  - type: ConnectionCheckedOut
+    connectionId: 1
+  - type: ConnectionCheckedIn
+    connectionId: 1
+  - type: ConnectionCheckedOut
+    connectionId: 1
+ignore:
+  - ConnectionPoolCreated
+  - ConnectionCreated
+  - ConnectionReady
+  - ConnectionCheckOutStarted