(CAT-2360) Remove all spec tests related to RHEL7/Debian 10

RHEL 7/Debian 10 is no longer supported by facterdb

Debian 10 was the only version suporting mod auth_kerb

Author: david22swan

spec/classes/mod/alias_spec.rb

@@ -13,13 +13,6 @@
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias /icons/ "/usr/share/apache2/icons/"}) }
     end
 
-    context 'on a RedHat 7-based OS', :compile do
-      include_examples 'RedHat 7'
-
-      it { is_expected.to contain_apache__mod('alias') }
-      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias /icons/ "/usr/share/httpd/icons/"}) }
-    end
-
     context 'on a RedHat 8-based OS', :compile do
       include_examples 'RedHat 8'
 
@@ -37,7 +30,7 @@
         }
       end
 
-      include_examples 'RedHat 7'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Options foo}) }
@@ -53,7 +46,7 @@
         }
       end
 
-      include_examples 'RedHat 7'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias /apache-icons/ "/usr/share/httpd/icons/"}) }
@@ -69,7 +62,7 @@
         }
       end
 
-      include_examples 'RedHat 7'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.not_to contain_file('alias.conf') }

spec/classes/mod/auth_kerb_spec.rb

@@ -6,15 +6,6 @@
   it_behaves_like 'a mod class, without including apache'
 
   context 'default configuration with parameters' do
-    context 'on a Debian OS', :compile do
-      include_examples 'Debian 10'
-
-      it { is_expected.to contain_class('apache::params') }
-      it { is_expected.to contain_class('apache::mod::authn_core') }
-      it { is_expected.to contain_apache__mod('auth_kerb') }
-      it { is_expected.to contain_package('libapache2-mod-auth-kerb') }
-    end
-
     context 'on a RedHat OS', :compile do
       include_examples 'RedHat 8'
 

spec/classes/mod/auth_openidc_spec.rb

@@ -16,16 +16,6 @@
       it { is_expected.not_to contain_package('dnf-module-mod_auth_openidc') }
     end
 
-    context 'on RedHat 7', :compile do
-      include_examples 'RedHat 7'
-
-      it { is_expected.to contain_class('apache::mod::authn_core') }
-      it { is_expected.to contain_class('apache::mod::authz_user') }
-      it { is_expected.to contain_apache__mod('auth_openidc') }
-      it { is_expected.to contain_package('mod_auth_openidc') }
-      it { is_expected.not_to contain_package('dnf-module-mod_auth_openidc') }
-    end
-
     context 'on RedHat 8', :compile do
       include_examples 'RedHat 8'
 

spec/classes/mod/authnz_ldap_spec.rb

@@ -10,7 +10,7 @@
 
     it { is_expected.to contain_class('apache::params') }
     it { is_expected.to contain_class('apache::mod::ldap') }
-    it { is_expected.to contain_apache__mod('authnz_ldap') }
+    it { is_expected.to contain_file('authnz_ldap.conf') }
 
     context 'default verify_server_cert' do
       it { is_expected.to contain_file('authnz_ldap.conf').with_content(%r{^LDAPVerifyServerCert On$}) }
@@ -34,6 +34,7 @@
   context 'default configuration with parameters on a RedHat OS' do
     on_supported_os.each do |os, os_facts|
       next unless os.start_with?('redhat')
+      next if os.start_with?('redhat')
 
       context "On #{os}" do
         let :facts do

spec/classes/mod/cluster_spec.rb

@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe 'apache::mod::cluster', type: :class do
-  context 'on a RedHat OS Release 7 with mod version = 1.3.0' do
-    include_examples 'RedHat 7'
+  context 'on a RedHat OS Release 8 with mod version = 1.3.0' do
+    include_examples 'RedHat 8'
 
     let(:params) do
       {
@@ -26,8 +26,8 @@
     it { is_expected.to contain_file('cluster.conf') }
   end
 
-  context 'on a RedHat OS Release 7 with mod version > 1.3.0' do
-    include_examples 'RedHat 7'
+  context 'on a RedHat OS Release 8 with mod version > 1.3.0' do
+    include_examples 'RedHat 8'
 
     let(:params) do
       {

spec/classes/mod/expires_spec.rb

@@ -22,7 +22,7 @@
       }
     end
 
-    include_examples 'RedHat 7'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_apache__mod('expires') }
 
@@ -47,7 +47,7 @@
       }
     end
 
-    include_examples 'RedHat 7'
+    include_examples 'RedHat 8'
 
     it { is_expected.to contain_apache__mod('expires') }
 

spec/classes/mod/fcgid_spec.rb

@@ -17,8 +17,8 @@
     it { is_expected.to contain_package('libapache2-mod-fcgid') }
   end
 
-  context 'on RHEL7' do
-    include_examples 'RedHat 7'
+  context 'on RHEL8' do
+    include_examples 'RedHat 8'
 
     describe 'without parameters' do
       it { is_expected.to contain_class('apache::params') }

spec/classes/mod/ssl_spec.rb

@@ -60,22 +60,6 @@
         it { is_expected.to contain_file('ssl.conf').without_content(%r{  SSLCipherSuite TLSv1.2 RSA:!EXP:!NULL:+HIGH:+MEDIUM:-LOW}) }
       end
     end
-
-    context '7 OS with custom directories for PR#1635' do
-      include_examples 'RedHat 7'
-      let :pre_condition do
-        "class { 'apache':
-          confd_dir           => '/etc/httpd/conf.puppet.d',
-          default_mods        => false,
-          default_vhost       => false,
-          mod_dir             => '/etc/httpd/conf.modules.puppet.d',
-          vhost_dir           => '/etc/httpd/conf.puppet.d',
-        }"
-      end
-
-      it { is_expected.to contain_package('mod_ssl') }
-      it { is_expected.to contain_file('ssl.conf').with_path('/etc/httpd/conf.puppet.d/ssl.conf') }
-    end
   end
 
   context 'on a Debian OS' do

spec/classes/mod/status_spec.rb

@@ -167,16 +167,6 @@ def require_directives(requires)
           }
         end
 
-        context 'on a RedHat 7 OS' do
-          include_examples 'RedHat 7'
-
-          it { is_expected.to contain_apache__mod('status') }
-
-          include_examples 'status_conf_spec_require', req_value, 'On', '/server-status'
-
-          it { is_expected.to contain_file('status.conf').with_path('/etc/httpd/conf.modules.d/status.conf') }
-        end
-
         context 'on a RedHat 8 OS' do
           include_examples 'RedHat 8'
 

spec/spec_helper_local.rb

@@ -34,11 +34,7 @@
 end
 
 shared_context 'a mod class, without including apache' do
-  let(:facts) { on_supported_os['debian-10-x86_64'] }
-end
-
-shared_context 'Debian 10' do
-  let(:facts) { on_supported_os['debian-10-x86_64'] }
+  let(:facts) { on_supported_os['debian-11-x86_64'] }
 end
 
 shared_context 'Debian 11' do
@@ -49,10 +45,6 @@
   let(:facts) { on_supported_os['ubuntu-18.04-x86_64'] }
 end
 
-shared_context 'RedHat 7' do
-  let(:facts) { on_supported_os['redhat-7-x86_64'] }
-end
-
 shared_context 'RedHat 8' do
   let(:facts) { on_supported_os['redhat-8-x86_64'] }
 end