Ability to run test suite on ssl

Author: estolfo

spec/mongo/auth/cr_spec.rb

@@ -7,11 +7,11 @@
   end
 
   let(:server) do
-    Mongo::Server.new(address, Mongo::Event::Listeners.new)
+    Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
   end
 
   let(:connection) do
-    Mongo::Server::Connection.new(server)
+    Mongo::Server::Connection.new(server, TEST_OPTIONS)
   end
 
   describe '#login' do

spec/mongo/auth/ldap_spec.rb

@@ -7,11 +7,11 @@
   end
 
   let(:server) do
-    Mongo::Server.new(address, Mongo::Event::Listeners.new)
+    Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
   end
 
   let(:connection) do
-    Mongo::Server::Connection.new(server)
+    Mongo::Server::Connection.new(server, TEST_OPTIONS)
   end
 
   let(:user) do

spec/mongo/auth/scram_spec.rb

@@ -7,11 +7,11 @@
   end
 
   let(:server) do
-    Mongo::Server.new(address, Mongo::Event::Listeners.new)
+    Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
   end
 
   let(:connection) do
-    Mongo::Server::Connection.new(server)
+    Mongo::Server::Connection.new(server, TEST_OPTIONS)
   end
 
   describe '#login' do

spec/mongo/auth/x509_spec.rb

@@ -7,11 +7,11 @@
   end
 
   let(:server) do
-    Mongo::Server.new(address, Mongo::Event::Listeners.new)
+    Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
   end
 
   let(:connection) do
-    Mongo::Server::Connection.new(server)
+    Mongo::Server::Connection.new(server, TEST_OPTIONS)
   end
 
   let(:user) do

spec/mongo/cluster_spec.rb

@@ -3,9 +3,10 @@
 describe Mongo::Cluster do
 
   let(:cluster) do
-    described_class.new(ADDRESSES)
+    described_class.new(ADDRESSES, TEST_OPTIONS)
   end
 
+
   describe '#==' do
 
     context 'when the other is a cluster' do
@@ -15,7 +16,7 @@
         context 'when the options are the same' do
 
           let(:other) do
-            described_class.new([ '127.0.0.1:27017' ])
+            described_class.new(ADDRESSES, TEST_OPTIONS)
           end
 
           it 'returns true' do
@@ -26,7 +27,7 @@
         context 'when the options are not the same' do
 
           let(:other) do
-            described_class.new([ '127.0.0.1:27017' ], :replica_set => 'test')
+            described_class.new([ '127.0.0.1:27017' ], TEST_OPTIONS.merge(:replica_set => 'test'))
           end
 
           it 'returns false' do
@@ -80,7 +81,7 @@
     context 'when the option is provided' do
 
       let(:cluster) do
-        described_class.new(ADDRESSES, :replica_set => 'testing')
+        described_class.new(ADDRESSES, TEST_OPTIONS.merge(:replica_set => 'testing'))
       end
 
       it 'returns the name' do
@@ -91,7 +92,7 @@
     context 'when the option is not provided' do
 
       let(:cluster) do
-        described_class.new(ADDRESSES)
+        described_class.new(ADDRESSES, TEST_OPTIONS)
       end
 
       it 'returns nil' do

spec/mongo/server/connection_spec.rb

@@ -7,7 +7,7 @@
   end
 
   let(:server) do
-    Mongo::Server.new(address, Mongo::Event::Listeners.new)
+    Mongo::Server.new(address, Mongo::Event::Listeners.new, TEST_OPTIONS)
   end
 
   describe '#connect!' do
@@ -66,9 +66,10 @@
         let(:connection) do
           described_class.new(
             server,
-            :user => 'notauser',
-            :password => 'password',
-            :database => TEST_DB
+            TEST_OPTIONS.merge(
+              :user => 'notauser',
+              :password => 'password',
+              :database => TEST_DB )
           )
         end
 
@@ -84,9 +85,10 @@
         let(:connection) do
           described_class.new(
             server,
-            :user => TEST_USER.name,
-            :password => TEST_USER.password,
-            :database => TEST_DB
+            TEST_OPTIONS.merge(
+              :user => TEST_USER.name,
+              :password => TEST_USER.password,
+              :database => TEST_DB )
           )
         end
 
@@ -136,9 +138,10 @@
     let!(:connection) do
       described_class.new(
         server,
-        :user => TEST_USER.name,
-        :password => TEST_USER.password,
-        :database => TEST_DB
+        TEST_OPTIONS.merge(
+          :user => TEST_USER.name,
+          :password => TEST_USER.password,
+          :database => TEST_DB )
       )
     end
 

spec/mongo/server/monitor_spec.rb

@@ -15,7 +15,7 @@
     context 'when calling multiple times in succession' do
 
       let(:monitor) do
-        described_class.new(address, listeners)
+        described_class.new(address, listeners, TEST_OPTIONS)
       end
 
       it 'throttles the scans to minimum 500ms' do
@@ -29,7 +29,7 @@
     context 'when the ismaster command succeeds' do
 
       let(:monitor) do
-        described_class.new(address, listeners)
+        described_class.new(address, listeners, TEST_OPTIONS)
       end
 
       before do

spec/mongo/socket/ssl_spec.rb

@@ -5,7 +5,7 @@
   describe '#connect!', if: running_ssl? do
 
     let(:socket) do
-      described_class.new('localhost', 27017, 5, Socket::PF_INET, options)
+      described_class.new(*DEFAULT_ADDRESS.split(":"), 5, Socket::PF_INET, options)
     end
 
     context 'when a certificate is provided' do

spec/spec_helper.rb

@@ -147,7 +147,7 @@ def list_command_enabled?
 end
 
 def running_ssl?
-  !!ENV['SSL']
+  SSL
 end
 
 alias :scram_sha_1_enabled? :list_command_enabled?
@@ -165,7 +165,7 @@ def failing_delete_doc
 #
 # @since 2.0.0
 def initialize_scanned_client!
-  Mongo::Client.new(ADDRESSES, database: TEST_DB, connect: CONNECT)
+  Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(database: TEST_DB))
 end
 
 # require all shared examples

spec/support/authorization.rb

@@ -40,6 +40,23 @@
             ENV['SHARDED_ENABLED'] == 'true' ? :sharded.freeze :
             :direct.freeze
 
+# The write concern to use in the tests.
+#
+# @since 2.0.0
+WRITE_CONCERN = (CONNECT == :replica_set) ? { w: ADDRESSES.size } : { w: 1 }
+
+# Whether to use SSL.
+#
+# @since 2.0.3
+SSL = ENV['SSL_ENABLED'] == 'true'
+
+# Options for test suite clients.
+#
+# @since 2.0.3
+TEST_OPTIONS = { max_pool_size: 1,
+                 write: WRITE_CONCERN,
+                 ssl: SSL }
+
 # The root user name.
 #
 # @since 2.0.0
@@ -93,32 +110,25 @@
   roles: [ Mongo::Auth::Roles::READ_WRITE, Mongo::Auth::Roles::DATABASE_ADMIN ]
 )
 
-# The write concern to use in the tests.
-#
-# @since 2.0.0
-WRITE_CONCERN = (CONNECT == :replica_set) ? { w: ADDRESSES.size } : { w: 1 }
-
 # Provides an authorized mongo client on the default test database for the
 # default test user.
 #
 # @since 2.0.0
 AUTHORIZED_CLIENT = Mongo::Client.new(
   ADDRESSES,
-  database: TEST_DB,
-  user: TEST_USER.name,
-  password: TEST_USER.password,
-  max_pool_size: 1,
-  write: WRITE_CONCERN
+  TEST_OPTIONS.merge(
+    database: TEST_DB,
+    user: TEST_USER.name,
+    password: TEST_USER.password)
 )
 
 # Provides an unauthorized mongo client on the default test database.
 #
 # @since 2.0.0
 UNAUTHORIZED_CLIENT = Mongo::Client.new(
   ADDRESSES,
-  database: TEST_DB,
-  max_pool_size: 1,
-  write: WRITE_CONCERN
+  TEST_OPTIONS.merge(
+    database: TEST_DB)
 )
 
 # Provides an unauthorized mongo client on the admin database, for use in
@@ -127,9 +137,8 @@
 # @since 2.0.0
 ADMIN_UNAUTHORIZED_CLIENT = Mongo::Client.new(
   ADDRESSES,
-  database: Mongo::Database::ADMIN,
-  max_pool_size: 1,
-  write: WRITE_CONCERN
+  TEST_OPTIONS.merge(
+    database: Mongo::Database::ADMIN)
 )
 
 # Get an authorized client on the test database logged in as the admin