Address failing spec tests

Author: jordanbreen28

lib/puppet/provider/sqlserver_instance/mssql.rb

@@ -68,7 +68,6 @@ def modify_features(features, action)
     begin
       config_file = create_temp_for_install_switch unless action == 'uninstall'
       cmd_args << "/ConfigurationFile=\"#{config_file.path}\"" unless config_file.nil?
-      cmd_args << '/UPDATEENABLED=False' if action == 'install'
       res = try_execute(cmd_args, "Error trying to #{action} features (#{features.join(', ')}", obfuscated_strings, [0, 1641, 3010])
 
       warn("#{action} of features (#{features.join(', ')}) returned exit code 3010 - reboot required")  if res.exitstatus == 3010

spec/unit/puppet/provider/sqlserver_instance_spec.rb

@@ -56,9 +56,9 @@ def stub_uninstall(args, installed_features, exit_code = 0)
                   '/ACTION=install',
                   '/Q',
                   '/IACCEPTSQLSERVERLICENSETERMS',
-                  '/UPDATEENABLED=False',
                   "/INSTANCENAME=#{execute_args[:name]}",
-                  "/FEATURES=#{execute_args[:features].join(',')}"]
+                  "/FEATURES=#{execute_args[:features].join(',')}",
+                  '/UPDATEENABLED=False']
       (execute_args.keys - ['ensure', 'loglevel', 'features', 'name', 'source', 'sql_sysadmin_accounts', 'sql_security_mode', 'install_switches'].map(&:to_sym)).sort.map do |key|
         cmd_args << "/#{resourcekey_to_cmdarg[key.to_s]}=\"#{@resource[key]}\""
       end

spec/unit/puppet/sqlserver_spec_helper.rb

@@ -23,8 +23,8 @@ def stub_modify_features(action, args, features, additional_switches = [], exit_
           '/Q',
           '/IACCEPTSQLSERVERLICENSETERMS',
           "/FEATURES=#{features.join(',')}"]
-  cmds << "/ISSVCACCOUNT=#{args[:is_svc_account]}" if args.key?(:is_svc_account)
   cmds << '/UPDATEENABLED=False' if action == 'install'
+  cmds << "/ISSVCACCOUNT=#{args[:is_svc_account]}" if args.key?(:is_svc_account)
   if args.key?(:is_svc_password)
     cmds << "/ISSVCPASSWORD=#{args[:is_svc_password]}"
   end

spec/unit/puppet_x/sql_connection_spec.rb

@@ -51,7 +51,7 @@ def stub_connection
 
       context 'Use default authentication' do
         it 'defauls to SQL_LOGIN if admin_login_type is not set' do
-          expect(@connection).to receive(:Open).with('Provider=MSOLEDBSQL;Initial Catalog=master;Application Name=Puppet;Data Source=.;DataTypeComptibility=80;User ID=sa;Password=Pupp3t1@')
+          expect(@connection).to receive(:Open).with('Provider=MSOLEDBSQL;Initial Catalog=master;Application Name=Puppet;Data Source=.;DataTypeComptibility=80;UID=sa;PWD=Pupp3t1@')
           subject.open_and_run_command('query', admin_user: 'sa', admin_pass: 'Pupp3t1@')
         end
       end
@@ -74,11 +74,11 @@ def stub_connection
         end
 
         it 'does not add the default instance of MSSQLSERVER to connection string' do
-          expect(@connection).to receive(:Open).with('Provider=MSOLEDBSQL;Initial Catalog=master;Application Name=Puppet;Data Source=.;DataTypeComptibility=80;User ID=sa;Password=Pupp3t1@')
+          expect(@connection).to receive(:Open).with('Provider=MSOLEDBSQL;Initial Catalog=master;Application Name=Puppet;Data Source=.;DataTypeComptibility=80;UID=sa;PWD=Pupp3t1@')
           subject.open_and_run_command('query', admin_user: 'sa', admin_pass: 'Pupp3t1@', instance_name: 'MSSQLSERVER')
         end
         it 'adds a non default instance to connection string' do
-          expect(@connection).to receive(:Open).with('Provider=MSOLEDBSQL;Initial Catalog=master;Application Name=Puppet;Data Source=.\\LOGGING;DataTypeComptibility=80;User ID=sa;Password=Pupp3t1@')
+          expect(@connection).to receive(:Open).with('Provider=MSOLEDBSQL;Initial Catalog=master;Application Name=Puppet;Data Source=.\\LOGGING;DataTypeComptibility=80;UID=sa;PWD=Pupp3t1@')
           subject.open_and_run_command('query', admin_user: 'sa', admin_pass: 'Pupp3t1@', instance_name: 'LOGGING')
         end
       end