((CONT-799) Rubocop Fixes 16-20

- Rspec/MultipleMemorizedHelpers
- Rspec/NestedGroups
- RspecRepeatedExampleGroupBody
- Rspec/RepeatedExampleGroupDescription
- Style/MixinUsage

Author: david22swan

.rubocop_todo.yml

@@ -33,11 +33,6 @@ RSpec/ImplicitSubject:
     - 'spec/defines/resolver_spec.rb'
     - 'spec/defines/userlist_spec.rb'
 
-# Offense count: 3
-# Configuration parameters: AllowSubject.
-RSpec/MultipleMemoizedHelpers:
-  Max: 6
-
 # Offense count: 96
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
@@ -46,12 +41,7 @@ RSpec/NamedSubject:
     - 'spec/classes/haproxy_spec.rb'
     - 'spec/defines/instance_service_spec.rb'
     - 'spec/defines/instance_spec.rb'
-
-# Offense count: 30
-# Configuration parameters: AllowedGroups.
-RSpec/NestedGroups:
-  Max: 5
-
+  
 # Offense count: 183
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_
@@ -66,19 +56,3 @@ RSpec/NoExpectationExample:
     - 'spec/classes/haproxy_spec.rb'
     - 'spec/defines/instance_service_spec.rb'
     - 'spec/defines/instance_spec.rb'
-
-# Offense count: 2
-RSpec/RepeatedExampleGroupBody:
-  Exclude:
-    - 'spec/acceptance/basic_spec.rb'
-
-# Offense count: 4
-RSpec/RepeatedExampleGroupDescription:
-  Exclude:
-    - 'spec/acceptance/listen_spec.rb'
-    - 'spec/defines/instance_spec.rb'
-
-# Offense count: 1
-Style/MixinUsage:
-  Exclude:
-    - 'spec/spec_helper.rb'

spec/acceptance/basic_spec.rb

@@ -29,12 +29,10 @@ class { 'haproxy':
       end
     end
 
-    describe port('9090') do
-      it { is_expected.not_to be_listening }
-    end
-
-    describe port('9091') do
-      it { is_expected.not_to be_listening }
+    ['9090', '9091'].each do |port|
+      describe port(port) do
+        it { is_expected.not_to be_listening }
+      end
     end
   end
 
@@ -93,43 +91,43 @@ class { 'haproxy': }
           end
         end
       end
+    end
 
-      context 'when "httpchk" option is defined and $sort_options_aphabetic => true' do
-        pp_httpchk_option = <<-PUPPETCODE
-        class { 'haproxy::globals':
-          sort_options_alphabetic => true,
-        }
-        class { 'haproxy': }
-        haproxy::listen { 'stats':
-          ipaddress => '127.0.0.1',
-          ports     => ['9091'],
-          mode      => 'http',
-        }
-        haproxy::backend { 'servers':
-          mode => 'http',
-          sort_options_alphabetic => true,
-          options => {
-            'option'  => [
-              'httpchk',
-            ],
-            'http-check' => 'disable-on-404',
-            'server' => [
-               'srv1 127.0.0.1:9091 check',
-            ],
-          },
-        }
-        PUPPETCODE
+    describe 'when "httpchk" option is defined and $sort_options_aphabetic => true' do
+      pp_httpchk_option = <<-PUPPETCODE
+      class { 'haproxy::globals':
+        sort_options_alphabetic => true,
+      }
+      class { 'haproxy': }
+      haproxy::listen { 'stats':
+        ipaddress => '127.0.0.1',
+        ports     => ['9091'],
+        mode      => 'http',
+      }
+      haproxy::backend { 'servers':
+        mode => 'http',
+        sort_options_alphabetic => true,
+        options => {
+          'option'  => [
+            'httpchk',
+          ],
+          'http-check' => 'disable-on-404',
+          'server' => [
+              'srv1 127.0.0.1:9091 check',
+          ],
+        },
+      }
+      PUPPETCODE
 
-        it 'overrides $sort_options_aphabetic to false and warn' do
-          apply_manifest(pp_httpchk_option, catch_failures: true) do |r|
-            expect(r.stderr).to contain %r{Overriding\sthe\svalue\sof\s\$sort_options_alphabetic\sto\s"false"\sdue\sto\s"httpchk"\soption\sdefined}
-          end
+      it 'overrides $sort_options_aphabetic to false and warn' do
+        apply_manifest(pp_httpchk_option, catch_failures: true) do |r|
+          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}
-          end
+      describe file('/etc/haproxy/haproxy.cfg') do # rubocop:disable RSpec/NestedGroups
+        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}
         end
       end
     end

spec/classes/haproxy_spec.rb

@@ -122,7 +122,7 @@
           )
         end
 
-        describe 'Base concat fragment contents' do
+        describe 'Base concat fragment contents' do # rubocop:disable RSpec/NestedGroups
           let(:contents) { param_value(catalogue, 'concat::fragment', 'haproxy-haproxy-base', 'content').split("\n") }
 
           # C9936 C9937
@@ -225,7 +225,7 @@
           )
         end
 
-        describe 'Base concat fragment contents' do
+        describe 'Base concat fragment contents' do # rubocop:disable RSpec/NestedGroups
           let(:contents) { param_value(catalogue, 'concat::fragment', 'haproxy-haproxy-base', 'content').split("\n") }
 
           it 'contains global and defaults sections' do
@@ -312,7 +312,7 @@
         )
       end
 
-      describe 'Base concat fragment contents' do
+      describe 'Base concat fragment contents' do # rubocop:disable RSpec/NestedGroups
         let(:contents) { param_value(catalogue, 'concat::fragment', 'haproxy-haproxy-base', 'content').split("\n") }
 
         # C9936 C9937
@@ -388,7 +388,7 @@
         )
       end
 
-      describe 'Base concat fragment contents' do
+      describe 'Base concat fragment contents' do # rubocop:disable RSpec/NestedGroups
         let(:contents) { param_value(catalogue, 'concat::fragment', 'haproxy-haproxy-base', 'content').split("\n") }
 
         it 'contains global and defaults sections' do

spec/defines/instance_spec.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 
 describe 'haproxy::instance' do
+  # rubocop:disable RSpec/NestedGroups
   let(:default_facts) do
     {
       concat_basedir: '/dne',
@@ -18,7 +19,7 @@
 
   # haproxy::instance with service name "haproxy".
 
-  context 'when on supported platforms' do
+  context 'with haproxy::instance with service name "haproxy' do
     let(:title) { 'haproxy' }
 
     describe 'for OS-agnostic configuration' do
@@ -218,7 +219,7 @@
             )
           end
 
-          describe 'Base concat fragment contents' do
+          describe 'Base concat fragment contents' do # rubocop:disable RSpec/MultipleMemoizedHelpers
             let(:contents) { param_value(catalogue, 'concat::fragment', 'haproxy-haproxy-base', 'content').split("\n") }
 
             it 'contains global and defaults sections' do
@@ -288,7 +289,7 @@
 
   # haproxy::instance with 2nd instance and with non-standard service name.
 
-  context 'when on supported platforms' do
+  context 'with haproxy::instance with 2nd instance and with non-standard service name' do
     let(:title) { 'group1' }
 
     describe 'for OS-agnostic configuration' do
@@ -471,7 +472,7 @@
             )
           end
 
-          describe 'Base concat fragment contents' do
+          describe 'Base concat fragment contents' do # rubocop:disable RSpec/MultipleMemoizedHelpers
             let(:contents) { param_value(catalogue, 'concat::fragment', 'haproxy-group1-haproxy-base', 'content').split("\n") }
 
             it 'contains global and defaults sections' do
@@ -639,7 +640,7 @@
           )
         end
 
-        describe 'Base concat fragment contents' do
+        describe 'Base concat fragment contents' do # rubocop:disable RSpec/MultipleMemoizedHelpers
           let(:contents) { param_value(catalogue, 'concat::fragment', 'haproxy-haproxy-base', 'content').split("\n") }
 
           it 'contains global and defaults sections' do
@@ -739,4 +740,5 @@
       }.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

@@ -9,7 +9,7 @@
 
 require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))
 
-include RspecPuppetFacts
+include RspecPuppetFacts # rubocop:disable Style/MixinUsage
 
 default_facts = {
   puppetversion: Puppet.version,