RUBY-890 Fix test suite to work with auth

Adjustments to MONGODB_CR

Author: estolfo

lib/mongo/auth/cr.rb

@@ -28,7 +28,7 @@ class CR
       # Instantiate a new authenticator.
       #
       # @example Create the authenticator.
-      #   Mongo::Auth::X509.new(user)
+      #   Mongo::Auth::CR.new(user)
       #
       # @param [ Mongo::Auth::User ] user The user to authenticate.
       #
@@ -48,24 +48,11 @@ def initialize(user)
       #
       # @since 2.0.0
       def login(connection)
-        conversation = Conversation.new(user, auth_database(connection))
+        conversation = Conversation.new(user)
         reply = connection.dispatch([ conversation.start ])
         reply = connection.dispatch([ conversation.continue(reply) ])
         conversation.finalize(reply)
       end
-
-      private
-
-      # If we are on MongoDB 2.6 and higher, we *always* authorize against the
-      # admin database. Otherwise for 2.4 and lower we authorize against the
-      # auth source provided. The logic for that is encapsulated in the User class.
-      def auth_database(connection)
-        if connection.features.write_command_enabled?
-          Database::ADMIN
-        else
-          user.auth_source
-        end
-      end
     end
   end
 end

lib/mongo/auth/cr/conversation.rb

@@ -56,7 +56,7 @@ class Conversation
         def continue(reply)
           validate!(reply)
           Protocol::Query.new(
-            database,
+            user.auth_source,
             Database::COMMAND,
             LOGIN.merge(user: user.name, nonce: nonce, key: user.auth_key(nonce)),
             limit: -1
@@ -89,7 +89,11 @@ def finalize(reply)
         #
         # @since 2.0.0
         def start
-          Protocol::Query.new(database, Database::COMMAND, Auth::GET_NONCE, limit: -1)
+          Protocol::Query.new(
+            user.auth_source,
+            Database::COMMAND,
+            Auth::GET_NONCE,
+            limit: -1)
         end
 
         # Create the new conversation.
@@ -101,9 +105,8 @@ def start
         # @param [ String ] database The database to authenticate against.
         #
         # @since 2.0.0
-        def initialize(user, database)
+        def initialize(user)
           @user = user
-          @database = database
         end
 
         private

lib/mongo/server/connection.rb

@@ -22,7 +22,7 @@ class Connection
       include Connectable
       extend Forwardable
 
-      # @return [ Mongo::Auth::CR, Mongo::Auth::X509, Mongo::Auth:LDAP ]
+      # @return [ Mongo::Auth::CR, Mongo::Auth::X509, Mongo::Auth:LDAP, Mongo::Auth::SCRAM ]
       #   authenticator The authentication strategy.
       attr_reader :authenticator
 

spec/spec_helper.rb

@@ -48,14 +48,14 @@
     begin
       # Adds the test user to the test database with permissions on all
       # databases that will be used in the test suite.
-      ADMIN_AUTHORIZED_CLIENT.database.users.create(TEST_USER)
+      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 datbases themselves. Also,
         # roles in versions lower than 2.6 can only be strings, not hashes.
-        begin ROOT_AUTHORIZED_CLIENT.database.users.create(TEST_READ_WRITE_USER); rescue; end
+        begin ADMIN_AUTHORIZED_TEST_CLIENT.database.users.create(TEST_READ_WRITE_USER); rescue; end
       end
     end
   end

spec/support/authorization.rb

@@ -54,7 +54,6 @@
 #
 # @since 2.0.0
 ROOT_USER = Mongo::Auth::User.new(
-  database: Mongo::Database::ADMIN,
   user: ROOT_USER_NAME,
   password: ROOT_USER_PWD,
   roles: [
@@ -113,21 +112,6 @@
   connect: CONNECT
 )
 
-# Provides an authorized mongo client on the default test database for the
-# default root system administrator.
-#
-# @since 2.0.0
-ROOT_AUTHORIZED_CLIENT = Mongo::Client.new(
-  ADDRESSES,
-  auth_source: Mongo::Database::ADMIN,
-  database: TEST_DB,
-  user: ROOT_USER.name,
-  password: ROOT_USER.password,
-  max_pool_size: 1,
-  write: WRITE_CONCERN,
-  connect: CONNECT
-)
-
 # Provides an unauthorized mongo client on the default test database.
 #
 # @since 2.0.0
@@ -151,13 +135,15 @@
   connect: CONNECT
 )
 
-# Get an authorized client on the admin database logged in as the admin
+# Get an authorized client on the test database logged in as the admin
 # root user.
 #
 # @since 2.0.0
-ADMIN_AUTHORIZED_CLIENT = ADMIN_UNAUTHORIZED_CLIENT.with(
+ADMIN_AUTHORIZED_TEST_CLIENT = ADMIN_UNAUTHORIZED_CLIENT.with(
   user: ROOT_USER.name,
-  password: ROOT_USER.password
+  password: ROOT_USER.password,
+  database: TEST_DB,
+  auth_source: Mongo::Database::ADMIN
 )
 
 module Authorization
@@ -185,12 +171,6 @@ def self.included(context)
     # @since 2.0.0
     context.let(:authorized_client) { AUTHORIZED_CLIENT }
 
-    # Provides an authorized mongo client on the default test database for the
-    # default root system administrator.
-    #
-    # @since 2.0.0
-    context.let(:root_authorized_client) { ROOT_AUTHORIZED_CLIENT }
-
     # Provides an unauthorized mongo client on the default test database.
     #
     # @since 2.0.0
@@ -202,11 +182,11 @@ def self.included(context)
     # @since 2.0.0
     context.let!(:admin_unauthorized_client) { ADMIN_UNAUTHORIZED_CLIENT }
 
-    # Get an authorized client on the admin database logged in as the admin
+    # Get an authorized client on the test database logged in as the admin
     # root user.
     #
     # @since 2.0.0
-    context.let!(:admin_authorized_client) { ADMIN_AUTHORIZED_CLIENT }
+    context.let!(:root_authorized_client) { ADMIN_AUTHORIZED_TEST_CLIENT }
 
     # Gets the default test collection from the authorized client.
     #