(CONT-799) Rubocop Fixes 4-9

- Lint/RedundantCopEnableDirective
- Style/IfUnlessModifier
- Style/RedundantRegexpEscape
- Style/RedundantStringEscape
- Style/RescueStandardError

Author: david22swan

.rubocop_todo.yml

@@ -6,12 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Lint/RedundantCopEnableDirective:
-  Exclude:
-    - 'spec/defines/instance_spec.rb'
-
 # Offense count: 33
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
@@ -127,37 +121,11 @@ RSpec/RepeatedExampleGroupDescription:
     - 'spec/acceptance/listen_spec.rb'
     - 'spec/defines/instance_spec.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Exclude:
-    - 'spec/spec_helper_acceptance_local.rb'
-
 # Offense count: 1
 Style/MixinUsage:
   Exclude:
     - 'spec/spec_helper.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantRegexpEscape:
-  Exclude:
-    - 'spec/defines/instance_spec.rb'
-
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantStringEscape:
-  Exclude:
-    - 'spec/acceptance/mapfile_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: implicit, explicit
-Style/RescueStandardError:
-  Exclude:
-    - 'spec/spec_helper.rb'
-
 # Offense count: 159
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleForMultiline.

spec/acceptance/mapfile_spec.rb

@@ -77,7 +77,7 @@
         file_line {'localhost':
           path  => '/etc/hosts',
           line  => '127.0.0.1 localhost host2 host3',
-          match => '^127\.0\.0\.1',
+          match => '^127.0.0.1',
         }
         include ::haproxy
         haproxy::mapfile { 'single-mapfile':
@@ -166,7 +166,7 @@
         file_line {'localhost':
           path  => '/etc/hosts',
           line  => '127.0.0.1 localhost host2 host3',
-          match => '^127\.0\.0\.1',
+          match => '^127.0.0.1',
         }
         include ::haproxy
         haproxy::mapfile { 'multiple-mapfiles':

spec/defines/instance_spec.rb

@@ -84,7 +84,7 @@
 
           it 'sets the haproxy package' do
             subject.should contain_concat__fragment('haproxy-haproxy-base').with_content(
-              %r{listen stats :9090\n  mode http\n  stats uri \/\n  stats auth puppet:puppet\n},
+              %r{listen stats :9090\n  mode http\n  stats uri /\n  stats auth puppet:puppet\n},
             )
           end
         end
@@ -310,7 +310,7 @@
 
           it 'sets the haproxy-group1 package' do
             subject.should contain_concat__fragment('haproxy-group1-haproxy-base').with_content(
-              %r{listen stats :9090\n  mode http\n  stats uri \/\n  stats auth puppet:puppet\n},
+              %r{listen stats :9090\n  mode http\n  stats uri /\n  stats auth puppet:puppet\n},
             )
           end
         end
@@ -666,5 +666,4 @@
       }.to raise_error(Puppet::Error, %r{operating system is not supported with the haproxy module})
     end
   end
-  # rubocop:enable RSpec/NestedGroups
 end

spec/spec_helper.rb

@@ -26,7 +26,7 @@
 
   begin
     default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
-  rescue => e
+  rescue StandardError => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end
 end

spec/spec_helper_acceptance_local.rb

@@ -44,9 +44,7 @@ def retry_on_error_matching(max_retry_count = MAX_RETRY_COUNT, retry_wait_interv
 
     if os[:family] == 'redhat' && os[:release].to_i != 8
       epel_owner = 'puppet'
-      if os[:release].to_i == 6
-        epel_owner = 'stahnma'
-      end
+      epel_owner = 'stahnma' if os[:release].to_i == 6
       LitmusHelper.instance.run_shell("puppet module install #{epel_owner}/epel")
       if os[:release][0].match?(%r{5|6})
         pp = <<-PP