Skip to content

Commit 87cbefc

Browse files
committed
Clean up passenger expectations
1 parent b6493c0 commit 87cbefc

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

spec/classes/mod/passenger_spec.rb

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -390,19 +390,11 @@
390390
it { is_expected.to contain_file('zpassenger.load').with_content(%r{^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$}) }
391391
end
392392

393-
context 'with Ubuntu 16.04 defaults' do
393+
context 'with defaults' do
394394
it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
395395
it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
396396
it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
397397
end
398-
399-
if facts[:os]['release']['major'].to_i == 8
400-
context 'with Debian 8 defaults' do
401-
it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerRoot "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"}) }
402-
it { is_expected.to contain_file('passenger.conf').without_content(%r{PassengerRuby}) }
403-
it { is_expected.to contain_file('passenger.conf').with_content(%r{PassengerDefaultRuby "/usr/bin/ruby"}) }
404-
end
405-
end
406398
when 'RedHat'
407399
context 'on a RedHat OS' do
408400
case facts[:os]['release']['major']

0 commit comments

Comments
 (0)