(CONT-772) Correct cop group 2

Author: LukasAud

.rubocop_todo.yml

@@ -1,27 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-04-19 17:41:01 UTC using RuboCop version 1.48.1.
+# on 2023-04-19 23:25:24 UTC using RuboCop version 1.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: aligned, indented
-Layout/LineEndStringConcatenationIndentation:
-  Exclude:
-    - 'spec/classes/mod/deflate_spec.rb'
-    - 'spec/classes/mod/info_spec.rb'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 202
-
 # Offense count: 3
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
 Lint/DuplicateBranch:
@@ -105,17 +89,6 @@ RSpec/EmptyLineAfterExampleGroup:
 RSpec/ExampleLength:
   Max: 107
 
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/ExcessiveDocstringSpacing:
-  Exclude:
-    - 'spec/classes/dev_spec.rb'
-    - 'spec/classes/mod/passenger_spec.rb'
-    - 'spec/classes/mod/php_spec.rb'
-    - 'spec/classes/mod/security_spec.rb'
-    - 'spec/defines/modsec_link_spec.rb'
-    - 'spec/defines/vhost_spec.rb'
-
 # Offense count: 6
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
 # Include: **/*_spec*rb*, **/spec/**/*
@@ -191,12 +164,6 @@ RSpec/RepeatedExampleGroupDescription:
     - 'spec/classes/apache_spec.rb'
     - 'spec/classes/mod/security_spec.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/SharedExamples:
-  Exclude:
-    - 'spec/spec_helper_local.rb'
-
 # Offense count: 4
 RSpec/StubbedMock:
   Exclude:
@@ -234,14 +201,6 @@ Style/GlobalStdStream:
   Exclude:
     - 'tasks/init.rb'
 
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/puppet/provider/a2mod.rb'
-    - 'spec/classes/dev_spec.rb'
-    - 'spec/spec_helper_acceptance_local.rb'
-
 # Offense count: 1
 Style/MixinUsage:
   Exclude:

lib/puppet/provider/a2mod.rb

@@ -6,9 +6,7 @@ class Puppet::Provider::A2mod < Puppet::Provider
   def self.prefetch(mods)
     instances.each do |prov|
       mod = mods[prov.name]
-      if mod
-        mod.provider = prov
-      end
+      mod.provider = prov if mod
     end
   end
 
@@ -29,9 +27,7 @@ def properties
   # Returns the properties of the given mod if it exists.
   def query
     self.class.instances.each do |mod|
-      if mod.name == name || mod.name.downcase == name
-        return mod.properties
-      end
+      return mod.properties if mod.name == name || mod.name.downcase == name
     end
     nil
   end

spec/classes/dev_spec.rb

@@ -4,7 +4,7 @@
 
 describe 'apache::dev' do
   on_supported_os.each do |os, facts|
-    context "on #{os} " do
+    context "on #{os}" do
       let :facts do
         facts
       end
@@ -22,9 +22,7 @@
         when 'Debian'
           it { is_expected.to contain_package('libaprutil1-dev') }
           it { is_expected.to contain_package('libapr1-dev') }
-          if facts[:os]['release']['major'].to_i < 8
-            it { is_expected.to contain_package('apache2-prefork-dev') }
-          end
+          it { is_expected.to contain_package('apache2-prefork-dev') } if facts[:os]['release']['major'].to_i < 8
         when 'Ubuntu'
           it { is_expected.to contain_package('apache2-dev') }
         when 'RedHat'

spec/classes/mod/deflate_spec.rb

@@ -7,8 +7,8 @@ def general_deflate_specs
   it { is_expected.to contain_apache__mod('deflate') }
 
   expected = "AddOutputFilterByType DEFLATE application/rss+xml\n" \
-  "AddOutputFilterByType DEFLATE application/x-javascript\n" \
-      "AddOutputFilterByType DEFLATE text/css\n" \
+             "AddOutputFilterByType DEFLATE application/x-javascript\n" \
+             "AddOutputFilterByType DEFLATE text/css\n" \
              "AddOutputFilterByType DEFLATE text/html\n" \
              "\n" \
              "DeflateFilterNote Input instream\n" \

spec/classes/mod/info_spec.rb

@@ -33,9 +33,9 @@ def general_info_specs_apache24
     end
 
     expected = "<Location /server-info>\n    " \
-        "SetHandler server-info\n    " \
-        "Require ip 10.10.1.2 192.168.1.2 127.0.0.1\n" \
-        "</Location>\n"
+               "SetHandler server-info\n    " \
+               "Require ip 10.10.1.2 192.168.1.2 127.0.0.1\n" \
+               "</Location>\n"
     it {
       is_expected.to contain_file('info.conf').with_content(expected)
     }

spec/classes/mod/passenger_spec.rb

@@ -4,7 +4,7 @@
 
 describe 'apache::mod::passenger', type: :class do
   on_supported_os.each do |os, facts|
-    context "on #{os} " do
+    context "on #{os}" do
       let :facts do
         facts
       end

spec/classes/mod/php_spec.rb

@@ -4,7 +4,7 @@
 
 describe 'apache::mod::php', type: :class do
   on_supported_os.each do |os, facts|
-    context "on #{os} " do
+    context "on #{os}" do
       let :facts do
         facts
       end

spec/classes/mod/security_spec.rb

@@ -4,7 +4,7 @@
 
 describe 'apache::mod::security', type: :class do
   on_supported_os.each do |os, facts|
-    context "on #{os} " do
+    context "on #{os}" do
       let :facts do
         facts
       end

spec/defines/modsec_link_spec.rb

@@ -14,7 +14,7 @@ class { "apache::mod::security": activated_rules => [] }
   end
 
   on_supported_os.each do |os, facts|
-    context "on #{os} " do
+    context "on #{os}" do
       let :facts do
         facts
       end

spec/defines/vhost_spec.rb

@@ -22,7 +22,7 @@
         }
       end
 
-      context "on #{os} " do
+      context "on #{os}" do
         let :facts do
           os_facts
         end

spec/spec_helper_acceptance_local.rb

@@ -29,13 +29,9 @@ def print_parsing_errors
 
 RSpec.configure do |c|
   # IPv6 is not enabled by default in the new travis-ci Trusty environment (see https://github.com/travis-ci/travis-ci/issues/8891 )
-  if ENV['CI'] == 'true'
-    c.filter_run_excluding ipv6: true
-  end
+  c.filter_run_excluding ipv6: true if ENV['CI'] == 'true'
   c.before :suite do
-    if %r{redhat|oracle}.match?(os[:family])
-      LitmusHelper.instance.run_shell('puppet module install puppet/epel')
-    end
+    LitmusHelper.instance.run_shell('puppet module install puppet/epel') if %r{redhat|oracle}.match?(os[:family])
 
     LitmusHelper.instance.apply_manifest(File.read(File.join(__dir__, 'setup_acceptance_node.pp')))
   end

spec/spec_helper_local.rb

@@ -29,7 +29,7 @@
   end
 end
 
-shared_examples :compile, compile: true do
+shared_examples 'compile', compile: true do
   it { is_expected.to compile.with_all_deps }
 end