From 012ce45d0407b3299962627e71a4b791afa2e6c6 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Mon, 15 Mar 2021 15:32:11 +0100 Subject: [PATCH 1/3] Match release names and numbers in php_spec.rb --- spec/classes/mod/php_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb index d5e8674d21..b396f13bd2 100644 --- a/spec/classes/mod/php_spec.rb +++ b/spec/classes/mod/php_spec.rb @@ -100,7 +100,7 @@ } end when '16.04' - context 'on stretch' do + context 'on xenial' do let :params do { content: 'somecontent' } end @@ -113,7 +113,7 @@ end when '18.04' - context 'on stretch' do + context 'on bionic' do let :params do { content: 'somecontent' } end From 6b7536fa69a5fe15a05b274fcc9ef51bb178ad01 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Mon, 15 Mar 2021 15:32:29 +0100 Subject: [PATCH 2/3] Nest contexts in php_spec.rb This uses rspec context nesting to get a better description. --- spec/classes/mod/php_spec.rb | 50 +++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb index b396f13bd2..ad62b6d4bb 100644 --- a/spec/classes/mod/php_spec.rb +++ b/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,19 +86,20 @@ 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 xenial' do From 56f326276289f0ee76400298049a46965d91d0d3 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Wed, 1 Sep 2021 13:58:06 +0200 Subject: [PATCH 3/3] Clean up passenger expectations --- spec/classes/mod/passenger_spec.rb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/spec/classes/mod/passenger_spec.rb b/spec/classes/mod/passenger_spec.rb index fb56891124..aed525e74d 100644 --- a/spec/classes/mod/passenger_spec.rb +++ b/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']