Skip to content

Various spec cleanups #2188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 1, 2021
Merged

Various spec cleanups #2188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
012ce45
Match release names and numbers in php_spec.rb
ekohl Mar 15, 2021
6b7536f
Nest contexts in php_spec.rb
ekohl Mar 15, 2021
56f3262
Clean up passenger expectations
ekohl Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions spec/classes/mod/passenger_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
54 changes: 28 additions & 26 deletions spec/classes/mod/php_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -113,7 +115,7 @@
end

when '18.04'
context 'on stretch' do
context 'on bionic' do
let :params do
{ content: 'somecontent' }
end
Expand Down