Replace Debian 6 tests with Debian 8

Debian 6 is no longer supported according to metadata.json so it doesn't
make sense to test it. Debian 8 is. This cleans it up.

Author: ekohl

spec/classes/apache_spec.rb

@@ -4,7 +4,7 @@
 
 describe 'apache', type: :class do
   context 'on a Debian OS' do
-    include_examples 'Debian 6'
+    include_examples 'Debian 8'
 
     it { is_expected.to contain_class('apache::params') }
     it {
@@ -17,7 +17,7 @@
     it { is_expected.to contain_group('www-data') }
     it { is_expected.to contain_class('apache::service') }
     it {
-      is_expected.to contain_file('/var/www').with(
+      is_expected.to contain_file('/var/www/html').with(
         'ensure' => 'directory',
       )
     }
@@ -46,7 +46,7 @@
       ).that_notifies('Class[Apache::Service]')
     }
     # Assert that load files are placed and symlinked for these mods, but no conf file.
-    ['auth_basic', 'authn_file', 'authz_default', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
+    ['auth_basic', 'authn_file', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
       it {
         is_expected.to contain_file("#{modname}.load").with(
           'path'   => "/etc/apache2/mods-available/#{modname}.load",
@@ -232,22 +232,13 @@
       end
     end
 
-    context '8' do
-      include_examples 'Debian 8'
-
-      it {
-        is_expected.to contain_file('/var/www/html').with(
-          'ensure' => 'directory',
-        )
-      }
-      describe 'Alternate mpm_modules when declaring mpm_module => prefork' do
-        let :params do
-          { mpm_module: 'worker' }
-        end
-
-        it { is_expected.to contain_exec('/usr/sbin/a2dismod event') }
-        it { is_expected.to contain_exec('/usr/sbin/a2dismod prefork') }
+    describe 'Alternate mpm_modules when declaring mpm_module => prefork' do
+      let :params do
+        { mpm_module: 'worker' }
       end
+
+      it { is_expected.to contain_exec('/usr/sbin/a2dismod event') }
+      it { is_expected.to contain_exec('/usr/sbin/a2dismod prefork') }
     end
 
     context 'on Ubuntu 14.04' do

spec/classes/mod/auth_gssapi_spec.rb

@@ -7,7 +7,7 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS', :compile do
-      include_examples 'Debian 6'
+      include_examples 'Debian 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_gssapi') }

spec/classes/mod/auth_kerb_spec.rb

@@ -7,7 +7,7 @@
 
   context 'default configuration with parameters' do
     context 'on a Debian OS', :compile do
-      include_examples 'Debian 6'
+      include_examples 'Debian 8'
 
       it { is_expected.to contain_class('apache::params') }
       it { is_expected.to contain_apache__mod('auth_kerb') }

spec/classes/mod/info_spec.rb

@@ -124,10 +124,10 @@ def general_info_specs_apache24
   it_behaves_like 'a mod class, without including apache'
 
   context 'On a Debian OS' do
-    include_examples 'Debian 6'
+    include_examples 'Debian 8'
 
     # Load the more generic tests for this context
-    general_info_specs_apache22
+    general_info_specs_apache24
 
     it {
       is_expected.to contain_file('info.conf').with(ensure: 'file',

spec/classes/mod/mime_magic_spec.rb

@@ -11,7 +11,7 @@ def general_mime_magic_specs
   it_behaves_like 'a mod class, without including apache'
 
   context 'On a Debian OS with default params' do
-    include_examples 'Debian 6'
+    include_examples 'Debian 8'
 
     general_mime_magic_specs
 
@@ -58,7 +58,7 @@ def general_mime_magic_specs
   end
 
   context 'with magic_file => /tmp/magic' do
-    include_examples 'Debian 6'
+    include_examples 'Debian 8'
 
     let :params do
       { magic_file: '/tmp/magic' }

spec/classes/mod/status_spec.rb

@@ -68,13 +68,13 @@ def require_directives(requires)
   it_behaves_like 'a mod class, without including apache'
 
   context 'default configuration with parameters' do
-    context 'on a Debian 6 OS' do
-      include_examples 'Debian 6'
+    context 'on a Debian 8 OS' do
+      include_examples 'Debian 8'
 
       context 'with default params' do
         it { is_expected.to contain_apache__mod('status') }
 
-        include_examples 'status_conf_spec', ['127.0.0.1', '::1'], 'On', '/server-status'
+        include_examples 'status_conf_spec_require', 'ip 127.0.0.1 ::1', 'On', '/server-status'
 
         it {
           is_expected.to contain_file('status.conf').with(ensure: 'file',
@@ -98,7 +98,7 @@ def require_directives(requires)
 
         it { is_expected.to compile }
 
-        include_examples 'status_conf_spec', ['10.10.10.10', '11.11.11.11'], 'Off', '/custom-status'
+        include_examples 'status_conf_spec_require', 'ip 10.10.10.10 11.11.11.11', 'Off', '/custom-status'
       end
 
       context "with valid parameter type $allow_from => ['10.10.10.10']" do

spec/spec_helper_local.rb

@@ -37,19 +37,6 @@
   let(:facts) { on_supported_os['debian-8-x86_64'] }
 end
 
-shared_context 'Debian 6' do
-  let :facts do
-    {
-      id: 'root',
-      kernel: 'Linux',
-      osfamily: 'Debian',
-      operatingsystem: 'Debian',
-      operatingsystemrelease: '6',
-      path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-    }
-  end
-end
-
 shared_context 'Debian 8' do
   let(:facts) { on_supported_os['debian-8-x86_64'] }
 end