Apply remaining rubocop fixes

Author: DavidS

.rubocop.yml

@@ -18,6 +18,7 @@ AllCops:
   - "**/Puppetfile"
   - "**/Vagrantfile"
   - "**/Guardfile"
+inherit_from: ".rubocop_todo.yml"
 Layout/LineLength:
   Description: People have wide screens, use them.
   Max: 200
@@ -89,6 +90,8 @@ Performance/CaseWhenSplat:
 Performance/Casecmp:
   Enabled: true
 Performance/CollectionLiteralInLoop:
+  Exclude:
+  - spec/**/*
   Enabled: true
 Performance/CompareWithBlock:
   Enabled: true
@@ -308,6 +311,8 @@ Metrics/PerceivedComplexity:
   Enabled: false
 Migration/DepartmentName:
   Enabled: false
+Naming/AccessorMethodName:
+  Enabled: false
 Naming/BlockParameterName:
   Enabled: false
 Naming/HeredocDelimiterCase:

.sync.yml

@@ -1,6 +1,8 @@
 ---
 ".gitlab-ci.yml":
   delete: true
+".rubocop.yml":
+  include_todos: true
 ".travis.yml":
   global_env:
     - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"

spec/acceptance/apache_ssl_spec.rb

@@ -23,7 +23,7 @@ class { 'apache':
 
     describe file("#{apache_hash['mod_ssl_dir']}/ssl.conf") do
       it { is_expected.to be_file }
-      if os[:family] =~ %r{redhat} && os[:release].to_i == 8
+      if os[:family].include?(redhat) && os[:release].to_i == 8
         it { is_expected.to contain 'SSLProtocol all' }
       else
         it { is_expected.to contain 'SSLProtocol all -SSLv2 -SSLv3' }

spec/acceptance/mod_php_spec.rb

@@ -25,11 +25,11 @@ class { 'apache::mod::php': }
     end
 
     if (os[:family] == 'ubuntu' && os[:release] == '16.04') ||
-       (os[:family] == 'debian' && os[:release] =~ %r{9})
+       (os[:family] == 'debian' && os[:release] =~ %r{^9\.})
       describe file("#{apache_hash['mod_dir']}/php7.0.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
-    elsif os[:family] == 'debian' && os[:release] =~ %r{10}
+    elsif os[:family] == 'debian' && os[:release] =~ %r{^10\.}
       describe file("#{apache_hash['mod_dir']}/php7.3.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
@@ -41,7 +41,7 @@ class { 'apache::mod::php': }
       describe file("#{apache_hash['mod_dir']}/php7.4.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end
-    elsif os[:family] == 'redhat' && os[:release] =~ %r{^8}
+    elsif os[:family] == 'redhat' && os[:release] =~ %r{^8\.}
       describe file("#{apache_hash['mod_dir']}/php7.conf") do
         it { is_expected.to contain 'DirectoryIndex index.php' }
       end

spec/acceptance/vhost_spec.rb

@@ -51,7 +51,7 @@ class { 'apache': }
     end
   end
 
-  context 'default vhost with ssl', unless: (os[:family] =~ %r{redhat} && os[:release].to_i == 8) do
+  context 'default vhost with ssl', unless: (os[:family].inclde?(redhat) && os[:release].to_i == 8) do
     pp = <<-MANIFEST
       file { '#{apache_hash['run_dir']}':
         ensure  => 'directory',

spec/classes/mod/info_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 # This function is called inside the OS specific contexts
-def general_info_specs_22
+def general_info_specs_apache22
   it { is_expected.to contain_apache__mod('info') }
 
   context 'passing no parameters' do
@@ -64,7 +64,7 @@ def general_info_specs_22
   end
 end
 
-def general_info_specs_24
+def general_info_specs_apache24
   it { is_expected.to contain_apache__mod('info') }
 
   context 'passing no parameters' do
@@ -138,7 +138,7 @@ def general_info_specs_24
     end
 
     # Load the more generic tests for this context
-    general_info_specs_22
+    general_info_specs_apache22
 
     it {
       is_expected.to contain_file('info.conf').with(ensure: 'file',
@@ -164,7 +164,7 @@ def general_info_specs_24
     end
 
     # Load the more generic tests for this context
-    general_info_specs_22
+    general_info_specs_apache22
 
     it {
       is_expected.to contain_file('info.conf').with(ensure: 'file',
@@ -186,7 +186,7 @@ def general_info_specs_24
     end
 
     # Load the more generic tests for this context
-    general_info_specs_24
+    general_info_specs_apache24
 
     it {
       is_expected.to contain_file('info.conf').with(ensure: 'file',
@@ -208,7 +208,7 @@ def general_info_specs_24
     end
 
     # Load the more generic tests for this context
-    general_info_specs_24
+    general_info_specs_apache24
 
     it {
       is_expected.to contain_file('info.conf').with(ensure: 'file',

spec/classes/mod/security_spec.rb

@@ -24,21 +24,17 @@
               lib: 'mod_unique_id.so',
             )
           }
+
           it { is_expected.to contain_package('mod_security_crs') }
-          if facts[:os]['release']['major'].to_i > 6 && facts[:os]['release']['major'].to_i <= 7
-            it {
-              is_expected.to contain_file('security.conf').with(
-                path: '/etc/httpd/conf.modules.d/security.conf',
-              )
-            }
-          end
-          if facts[:os]['release']['major'].to_i >= 8
+
+          if (facts[:os]['release']['major'].to_i > 6 && facts[:os]['release']['major'].to_i <= 7) || (facts[:os]['release']['major'].to_i >= 8)
             it {
               is_expected.to contain_file('security.conf').with(
                 path: '/etc/httpd/conf.modules.d/security.conf',
               )
             }
           end
+
           it {
             is_expected.to contain_file('security.conf')
               .with_content(%r{^\s+SecAuditLogRelevantStatus "\^\(\?:5\|4\(\?!04\)\)"$})

spec/classes/mod/status_spec.rb

@@ -18,7 +18,7 @@ def status_conf_spec(allow_from, extended_status, status_path)
     "    # Show Proxy LoadBalancer status in mod_status\n"\
     "    ProxyStatus On\n"\
     "</IfModule>\n"
-  it do
+  it('status conf') do
     is_expected.to contain_file('status.conf').with_content(expected)
   end
 end
@@ -59,7 +59,7 @@ def status_conf_spec_require(requires, extended_status, status_path)
     "    # Show Proxy LoadBalancer status in mod_status\n"\
     "    ProxyStatus On\n"\
     "</IfModule>\n"
-  it do
+  it('status conf require') do
     is_expected.to contain_file('status.conf').with_content(expected)
   end
 end
@@ -251,6 +251,8 @@ def status_conf_spec_require(requires, extended_status, status_path)
         }
       end
 
+      it { is_expected.to compile }
+
       status_conf_spec(['10.10.10.10', '11.11.11.11'], 'Off', '/custom-status')
     end
 

spec/defines/fastcgi_server_spec.rb

@@ -28,7 +28,7 @@
             path: "/etc/httpd/conf.d/fastcgi-pool-#{title}.conf",
           )
         }
-      when 'Debian'
+      when 'Debian', 'Gentoo'
         it {
           is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
             ensure: 'file',
@@ -42,13 +42,6 @@
             path: "/usr/local/etc/apache24/Includes/fastcgi-pool-#{title}.conf",
           )
         }
-      when 'Gentoo'
-        it {
-          is_expected.to contain_file("fastcgi-pool-#{title}.conf").with(
-            ensure: 'file',
-            path: "/etc/apache2/conf.d/fastcgi-pool-#{title}.conf",
-          )
-        }
       end
 
       describe 'os-independent items' do

spec/defines/vhost_custom_spec.rb

@@ -27,6 +27,8 @@
       end
       let(:params) { default_params }
       let(:facts) { default_facts }
+
+      it { is_expected.to compile }
     end
     context 'on Debian based systems' do
       let :default_facts do