(CONT-799) Rubocop Fixes 10-12

- Rspec/EmptyLineAfterExample
- Rspec/EmptyLineAfterExampleGroup
- Style/TrailingCommaHashLiteral

Author: david22swan

.rubocop_todo.yml

@@ -21,30 +21,6 @@ RSpec/ContextWording:
 RSpec/DescribeClass:
   Enabled: false
 
-# Offense count: 138
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowConsecutiveOneLiners.
-RSpec/EmptyLineAfterExample:
-  Exclude:
-    - 'spec/acceptance/basic_spec.rb'
-    - 'spec/acceptance/userlist_spec.rb'
-    - 'spec/classes/haproxy_spec.rb'
-    - 'spec/defines/instance_service_spec.rb'
-    - 'spec/defines/instance_spec.rb'
-    - 'spec/defines/mapfile_entry_spec.rb'
-    - 'spec/defines/mapfile_spec.rb'
-
-# Offense count: 50
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/EmptyLineAfterExampleGroup:
-  Exclude:
-    - 'spec/acceptance/basic_spec.rb'
-    - 'spec/classes/haproxy_spec.rb'
-    - 'spec/defines/balancermember_spec.rb'
-    - 'spec/defines/frontend_spec.rb'
-    - 'spec/defines/instance_spec.rb'
-    - 'spec/defines/listen_spec.rb'
-
 # Offense count: 3
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
@@ -125,10 +101,3 @@ RSpec/RepeatedExampleGroupDescription:
 Style/MixinUsage:
   Exclude:
     - 'spec/spec_helper.rb'
-
-# Offense count: 159
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Enabled: false

spec/acceptance/basic_spec.rb

@@ -32,6 +32,7 @@ class { 'haproxy':
     describe port('9090') do
       it { is_expected.not_to be_listening }
     end
+
     describe port('9091') do
       it { is_expected.not_to be_listening }
     end
@@ -124,6 +125,7 @@ class { 'haproxy': }
             expect(r.stderr).to contain %r{Overriding\sthe\svalue\sof\s\$sort_options_alphabetic\sto\s"false"\sdue\sto\s"httpchk"\soption\sdefined}
           end
         end
+
         describe file('/etc/haproxy/haproxy.cfg') do
           its(:content) do
             is_expected.to match %r{backend\sservers\n\s+mode\shttp\n\s+option\shttpchk\n\s+http-check\s+disable-on-404}
@@ -146,6 +148,7 @@ class { 'haproxy':
         apply_manifest(pp_four, catch_failures: true)
       end
     end
+
     describe package('haproxy') do
       it { is_expected.not_to be_installed }
     end
@@ -167,6 +170,7 @@ class { 'haproxy':
         apply_manifest(pp_five, catch_failures: true)
       end
     end
+
     describe service('haproxy') do
       it { is_expected.not_to be_running }
       it { is_expected.not_to be_enabled }

spec/acceptance/userlist_spec.rb

@@ -59,6 +59,7 @@ class { 'haproxy': }
   it 'test1 should auth as user' do
     expect(run_shell('curl http://test1:elgato@localhost:5555').stdout.chomp).to eq('Response on 5556')
   end
+
   it 'test2 should auth as user' do
     expect(run_shell('curl http://test2:elgato@localhost:5555').stdout.chomp).to eq('Response on 5556')
   end