Merge pull request #2188 from ekohl/clean-specs

Various spec cleanups

Author: bastelfreak

spec/classes/mod/passenger_spec.rb

@@ -390,19 +390,11 @@
           it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$}) }
         end
 
-        context 'with Ubuntu 16.04 defaults' do
+        context 'with defaults' do
           it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
           it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
           it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
         end
-
-        if facts[:os]['release']['major'].to_i == 8
-          context 'with Debian 8 defaults' do
-            it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
-            it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
-            it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
-          end
-        end
       when 'RedHat'
         context 'on a RedHat OS' do
           case facts[:os]['release']['major']

spec/classes/mod/php_spec.rb

@@ -62,19 +62,20 @@
                   content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.3.so\n",
                 )
               }
-            end
-            context 'on buster with experimental php8.0' do
-              let :params do
-                { php_version: '8.0' }
-              end
 
-              it { is_expected.to contain_apache__mod('php') }
-              it { is_expected.to contain_package('libapache2-mod-php8.0') }
-              it {
-                is_expected.to contain_file('php.load').with(
-                  content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
-                )
-              }
+              context 'with experimental php8.0' do
+                let :params do
+                  { php_version: '8.0' }
+                end
+
+                it { is_expected.to contain_apache__mod('php') }
+                it { is_expected.to contain_package('libapache2-mod-php8.0') }
+                it {
+                  is_expected.to contain_file('php.load').with(
+                    content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
+                  )
+                }
+              end
             end
           when '11'
             context 'on bullseye' do
@@ -85,22 +86,23 @@
                   content: "LoadModule php7_module /usr/lib/apache2/modules/libphp7.4.so\n",
                 )
               }
-            end
-            context 'on bullseye with experimental php8.0' do
-              let :params do
-                { php_version: '8.0' }
-              end
 
-              it { is_expected.to contain_apache__mod('php') }
-              it { is_expected.to contain_package('libapache2-mod-php8.0') }
-              it {
-                is_expected.to contain_file('php.load').with(
-                  content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
-                )
-              }
+              context 'with experimental php8.0' do
+                let :params do
+                  { php_version: '8.0' }
+                end
+
+                it { is_expected.to contain_apache__mod('php') }
+                it { is_expected.to contain_package('libapache2-mod-php8.0') }
+                it {
+                  is_expected.to contain_file('php.load').with(
+                    content: "LoadModule php_module /usr/lib/apache2/modules/libphp.so\n",
+                  )
+                }
+              end
             end
           when '16.04'
-            context 'on stretch' do
+            context 'on xenial' do
               let :params do
                 { content: 'somecontent' }
               end
@@ -113,7 +115,7 @@
             end
 
           when '18.04'
-            context 'on stretch' do
+            context 'on bionic' do
               let :params do
                 { content: 'somecontent' }
               end