(CONT-789) Rubocop Unsafe Autocorrect 1-3

- Performance/MapCompact
- Performance/StringInclude
- RSpec/BeEq & RSpec/BeNil

Author: david22swan

.rubocop_todo.yml

@@ -99,27 +99,6 @@ Performance/CollectionLiteralInLoop:
     - 'spec/classes/mysql_server_backup_spec.rb'
     - 'spec/defines/mysql_db_spec.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Performance/MapCompact:
-  Exclude:
-    - 'lib/puppet/provider/mysql_login_path/mysql_login_path.rb'
-
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Performance/StringInclude:
-  Exclude:
-    - 'lib/puppet/provider/mysql_grant/mysql.rb'
-    - 'lib/puppet/provider/mysql_login_path/mysql_login_path.rb'
-
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-RSpec/BeEq:
-  Exclude:
-    - 'spec/functions/mysql_normalise_and_deepmerge_spec.rb'
-    - 'spec/functions/mysql_password_spec.rb'
-    - 'spec/functions/mysql_strip_hash_spec.rb'
-
 # Offense count: 64
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without

lib/puppet/provider/mysql_grant/mysql.rb

@@ -19,7 +19,7 @@ def self.instances
         # Default root user created by mysql_install_db on a host with fqdn
         # of myhost.mydomain.my: root@myhost.mydomain.my, when MySQL is started
         # with --skip-name-resolve.
-        next if %r{There is no such grant defined for user}.match?(e.inspect)
+        next if e.inspect.include?('There is no such grant defined for user')
 
         raise Puppet::Error, _('#mysql had an error ->  %{inspect}') % { inspect: e.inspect }
       end

lib/puppet/provider/mysql_login_path/mysql_login_path.rb

@@ -79,7 +79,7 @@ def get_password(context, uid, name)
     result = ''
     output = my_print_defaults_cmd(context, uid, '-s', name)
     output.split("\n").each do |line|
-      result = line.sub(%r{--password=}, '') if %r{--password}.match?(line)
+      result = line.sub(%r{--password=}, '') if line.include?('--password')
     end
     result
   end
@@ -133,7 +133,7 @@ def list_login_paths(context, uid)
 
   def get(context, name)
     result = []
-    owner = name.empty? ? ['root'] : name.map { |item| item[:owner] }.compact.uniq
+    owner = name.empty? ? ['root'] : name.filter_map { |item| item[:owner] }.uniq
     owner.each do |uid|
       login_paths = list_login_paths(context, uid)
       result += login_paths

spec/functions/mysql_normalise_and_deepmerge_spec.rb

@@ -4,7 +4,7 @@
 
 describe 'mysql::normalise_and_deepmerge' do
   it 'exists' do
-    expect(subject).not_to eq(nil)
+    expect(subject).not_to be_nil
   end
 
   it 'throws error with no arguments' do

spec/functions/mysql_password_spec.rb

@@ -4,7 +4,7 @@
 
 shared_examples 'mysql::password function' do
   it 'exists' do
-    expect(subject).not_to eq(nil)
+    expect(subject).not_to be_nil
   end
 
   it 'raises a ArgumentError if there is less than 1 arguments' do

spec/functions/mysql_strip_hash_spec.rb

@@ -4,7 +4,7 @@
 
 describe 'mysql::strip_hash' do
   it 'exists' do
-    expect(subject).not_to eq(nil)
+    expect(subject).not_to be_nil
   end
 
   it 'raises a ArgumentError if there is less than 1 arguments' do