Updates for ssl testing

Author: estolfo

spec/mongo/client_spec.rb

@@ -2,6 +2,14 @@
 
 describe Mongo::Client do
 
+  before do
+    if running_ssl?
+      allow_any_instance_of(Mongo::Server::Monitor).to receive(:ismaster) do
+        [{}, 1]
+      end
+    end
+  end
+
   describe '#==' do
 
     let(:client) do

spec/mongo/cluster/topology/replica_set_spec.rb

@@ -9,19 +9,19 @@
   describe '#servers' do
 
     let(:mongos) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:standalone) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:replica_set) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:replica_set_two) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:mongos_description) do

spec/mongo/cluster/topology/sharded_spec.rb

@@ -13,15 +13,15 @@
   describe '.servers' do
 
     let(:mongos) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:standalone) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:replica_set) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:mongos_description) do

spec/mongo/cluster/topology/single_spec.rb

@@ -13,19 +13,19 @@
   describe '.servers' do
 
     let(:mongos) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:standalone) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:standalone_two) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:replica_set) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
     end
 
     let(:mongos_description) do

spec/mongo/cluster_spec.rb

@@ -6,7 +6,6 @@
     described_class.new(ADDRESSES, TEST_OPTIONS)
   end
 
-
   describe '#==' do
 
     context 'when the other is a cluster' do
@@ -39,7 +38,7 @@
       context 'when the addresses are not the same' do
 
         let(:other) do
-          described_class.new([ '127.0.0.1:27018' ])
+          described_class.new([ '127.0.0.1:27018' ], TEST_OPTIONS)
         end
 
         it 'returns false' do
@@ -74,14 +73,10 @@
       Mongo::ServerSelector.get
     end
 
-    let(:cluster) do
-      described_class.new(ADDRESSES, :replica_set => 'testing')
-    end
-
     context 'when the option is provided' do
 
       let(:cluster) do
-        described_class.new(ADDRESSES, TEST_OPTIONS.merge(:replica_set => 'testing'))
+        described_class.new([ '127.0.0.1:27017' ], TEST_OPTIONS.merge(:replica_set => 'testing'))
       end
 
       it 'returns the name' do
@@ -92,7 +87,7 @@
     context 'when the option is not provided' do
 
       let(:cluster) do
-        described_class.new(ADDRESSES, TEST_OPTIONS)
+        described_class.new([ '127.0.0.1:27017' ], TEST_OPTIONS)
       end
 
       it 'returns nil' do

spec/mongo/server/connection_pool_spec.rb

@@ -9,7 +9,7 @@
   describe '#checkin' do
 
     let(:server) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
     end
 
     let(:pool) do
@@ -39,7 +39,7 @@
   describe '#checkout' do
 
     let(:server) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
     end
 
     let(:pool) do
@@ -87,7 +87,7 @@
   describe '.get' do
 
     let(:server) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
     end
 
     let(:pool) do
@@ -102,7 +102,7 @@
   describe '#inspect' do
 
     let(:server) do
-      Mongo::Server.new(address, Mongo::Event::Listeners.new)
+      Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
     end
 
     let(:pool) do

spec/mongo/server/connection_spec.rb

@@ -7,7 +7,7 @@
   end
 
   let(:server) do
-    Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
+    Mongo::Server.new(address, Mongo::Event::Listeners.new, ssl: SSL)
   end
 
   describe '#connect!' do

spec/mongo/server_selection_rtt_spec.rb

@@ -88,7 +88,8 @@ def average_round_trip_time(start)
       end
 
       let(:monitor) do
-        Mongo::Server::Monitor.new(address, Mongo::Event::Listeners.new, avg_rtt_ms: spec.avg_rtt_ms)
+        Mongo::Server::Monitor.new(address, Mongo::Event::Listeners.new,
+                                   TEST_OPTIONS.merge(avg_rtt_ms: spec.avg_rtt_ms))
       end
 
       before do

spec/mongo/server_selection_spec.rb

@@ -31,7 +31,7 @@
       let(:candidate_servers) do
         spec.candidate_servers.collect do |server|
           address = Mongo::Address.new(server['address'])
-          Mongo::Server.new(address, Mongo::Event::Listeners.new).tap do |s|
+          Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS).tap do |s|
             allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
             allow(s).to receive(:tags).and_return(server['tags'])
             allow(s).to receive(:secondary?).and_return(server['type'] == 'RSSecondary')
@@ -43,7 +43,7 @@
       let(:in_latency_window) do
         spec.in_latency_window.collect do |server|
           address = Mongo::Address.new(server['address'])
-          Mongo::Server.new(address, Mongo::Event::Listeners.new).tap do |s|
+          Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS).tap do |s|
             allow(s).to receive(:average_round_trip_time).and_return(server['avg_rtt_ms'])
             allow(s).to receive(:tags).and_return(server['tags'])
           end

spec/mongo/server_selector/nearest_spec.rb

@@ -118,7 +118,7 @@
         end
       end
 
-      context 'mtuliple candidates' do
+      context 'multiple candidates' do
 
         context 'no matching servers' do
           let(:candidates) { [primary, secondary, secondary] }

spec/mongo/server_spec.rb

@@ -13,7 +13,7 @@
   describe '#==' do
 
     let(:server) do
-      described_class.new(address, listeners)
+      described_class.new(address, listeners, TEST_OPTIONS)
     end
 
     context 'when the other is not a server' do
@@ -32,7 +32,7 @@
       context 'when the addresses match' do
 
         let(:other) do
-          described_class.new(address, listeners)
+          described_class.new(address, listeners, TEST_OPTIONS)
         end
 
         it 'returns true' do
@@ -47,7 +47,7 @@
         end
 
         let(:other) do
-          described_class.new(other_address, listeners)
+          described_class.new(other_address, listeners, TEST_OPTIONS)
         end
 
         it 'returns false' do
@@ -60,7 +60,7 @@
   describe '#context' do
 
     let(:server) do
-      described_class.new(address, listeners)
+      described_class.new(address, listeners, TEST_OPTIONS)
     end
 
     let(:context) do
@@ -75,7 +75,7 @@
   describe '#disconnect!' do
 
     let(:server) do
-      described_class.new(address, listeners)
+      described_class.new(address, listeners, TEST_OPTIONS)
     end
 
     it 'stops the monitor instance' do
@@ -87,7 +87,7 @@
   describe '#initialize' do
 
     let(:server) do
-      described_class.new(address, listeners, :heartbeat_frequency => 5)
+      described_class.new(address, listeners, TEST_OPTIONS.merge(:heartbeat_frequency => 5))
     end
 
     it 'sets the address host' do
@@ -99,14 +99,14 @@
     end
 
     it 'sets the options' do
-      expect(server.options).to eq(:heartbeat_frequency => 5)
+      expect(server.options).to eq(TEST_OPTIONS.merge(:heartbeat_frequency => 5))
     end
   end
 
   describe '#pool' do
 
     let(:server) do
-      described_class.new(address, listeners)
+      described_class.new(address, listeners, TEST_OPTIONS)
     end
 
     let(:pool) do
@@ -121,7 +121,7 @@
   describe '#scan!' do
 
     let(:server) do
-      described_class.new(address, listeners)
+      described_class.new(address, listeners, TEST_OPTIONS)
     end
 
     it 'forces a scan on the monitor' do

spec/support/shared/server_selector.rb

@@ -13,7 +13,7 @@ def server(mode, options = {})
   listeners = Mongo::Event::Listeners.new
   address = Mongo::Address.new('127.0.0.1:27017')
 
-  server = Mongo::Server.new(address, listeners)
+  server = Mongo::Server.new(address, listeners, TEST_OPTIONS)
   description = Mongo::Server::Description.new(address, ismaster, average_round_trip_time)
   server.tap do |s|
     allow(s).to receive(:description).and_return(description)