(CONT-189) Remove RHEL 6 from Spec tests

Author: david22swan

spec/classes/apache_spec.rb

@@ -725,7 +725,7 @@
     }
   end
   context 'on all OSes' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     context 'with a custom apache_name parameter' do
       let :params do

spec/classes/mod/alias_spec.rb

@@ -12,12 +12,6 @@
       it { is_expected.to contain_apache__mod('alias') }
       it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/usr\/share\/apache2\/icons\/"}) }
     end
-    context 'on a RedHat 6-based OS', :compile do
-      include_examples 'RedHat 6'
-
-      it { is_expected.to contain_apache__mod('alias') }
-      it { is_expected.to contain_file('alias.conf').with(content: %r{Alias \/icons\/ "\/var\/www\/icons\/"}) }
-    end
     context 'on a RedHat 7-based OS', :compile do
       include_examples 'RedHat 7'
 

spec/classes/mod/auth_cas_spec.rb

@@ -38,13 +38,13 @@
       it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASIdleTimeout 4321}) }
     end
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       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_cas') }
       it { is_expected.to contain_package('mod_auth_cas') }
-      it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.d/auth_cas.conf') }
+      it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.modules.d/auth_cas.conf') }
       it { is_expected.to contain_file('/var/cache/mod_auth_cas/').with_owner('apache') }
       it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASTimeout 1234}) }
       it { is_expected.to contain_file('auth_cas.conf').with_content(%r{CASIdleTimeout 4321}) }
@@ -55,13 +55,13 @@
         "class { 'apache': } apache::vhost { 'test.server': docroot => '/var/www/html', cas_root_proxied_as => 'http://test.server', cas_cookie_path => '/my/cas/path'} "
       end
 
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       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_cas') }
       it { is_expected.to contain_package('mod_auth_cas') }
-      it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.d/auth_cas.conf') }
+      it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.modules.d/auth_cas.conf') }
       it { is_expected.to contain_file('/var/cache/mod_auth_cas/').with_owner('apache') }
       it {
         is_expected.to contain_concat__fragment('test.server-auth_cas').with(content: %r{^\s+CASRootProxiedAs http://test.server$})

spec/classes/mod/auth_gssapi_spec.rb

@@ -15,7 +15,7 @@
       it { is_expected.to contain_package('libapache2-mod-auth-gssapi') }
     end
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::authn_core') }

spec/classes/mod/auth_kerb_spec.rb

@@ -15,7 +15,7 @@
       it { is_expected.to contain_package('libapache2-mod-auth-kerb') }
     end
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_class('apache::mod::authn_core') }
@@ -41,7 +41,7 @@
   end
   context 'overriding mod_packages' do
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
       let :pre_condition do
         <<-MANIFEST
         include apache::params

spec/classes/mod/auth_mellon_spec.rb

@@ -36,13 +36,13 @@
     end
   end
   context 'default configuration with parameters on a RedHat OS' do
-    include_examples 'RedHat 6'
+    include_examples 'RedHat 8'
 
     describe 'with no parameters' do
       it { is_expected.to contain_class('apache::mod::authn_core') }
       it { is_expected.to contain_apache__mod('auth_mellon') }
       it { is_expected.to contain_package('mod_auth_mellon') }
-      it { is_expected.to contain_file('auth_mellon.conf').with_path('/etc/httpd/conf.d/auth_mellon.conf') }
+      it { is_expected.to contain_file('auth_mellon.conf').with_path('/etc/httpd/conf.modules.d/auth_mellon.conf') }
       it { is_expected.to contain_file('auth_mellon.conf').with_content("MellonCacheSize 100\nMellonLockFile \"/run/mod_auth_mellon/lock\"\n") }
     end
     describe 'with parameters' do

spec/classes/mod/auth_openidc_spec.rb

@@ -50,7 +50,7 @@
   end
   context 'overriding mod_packages' do
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
       let :pre_condition do
         <<-MANIFEST
         include apache::params

spec/classes/mod/authn_dbd_spec.rb

@@ -32,12 +32,12 @@
     end
 
     context 'on a RedHat OS', :compile do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('authn_dbd') }
       it { is_expected.to contain_apache__mod('dbd') }
-      it { is_expected.to contain_file('authn_dbd.conf').with_path('/etc/httpd/conf.d/authn_dbd.conf') }
+      it { is_expected.to contain_file('authn_dbd.conf').with_path('/etc/httpd/conf.modules.d/authn_dbd.conf') }
     end
   end
 end

spec/classes/mod/cluster_spec.rb

@@ -48,27 +48,4 @@
 
     it { is_expected.to contain_file('cluster.conf') }
   end
-
-  context 'on a RedHat OS Release 6 with mod version < 1.3.0' do
-    include_examples 'RedHat 6'
-
-    let(:params) do
-      {
-        allowed_network: '172.17.0',
-        balancer_name: 'mycluster',
-        ip: '172.17.0.1',
-        version: '1.2.0',
-      }
-    end
-
-    it { is_expected.to contain_class('apache') }
-    it { is_expected.to contain_apache__mod('proxy') }
-    it { is_expected.to contain_apache__mod('proxy_ajp') }
-    it { is_expected.to contain_apache__mod('manager') }
-    it { is_expected.to contain_apache__mod('proxy_cluster') }
-    it { is_expected.to contain_apache__mod('advertise') }
-    it { is_expected.to contain_apache__mod('slotmem') }
-
-    it { is_expected.to contain_file('cluster.conf') }
-  end
 end

spec/classes/mod/dav_svn_spec.rb

@@ -28,7 +28,7 @@
       end
     end
     context 'on a RedHat OS' do
-      include_examples 'RedHat 6'
+      include_examples 'RedHat 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('dav_svn') }