diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb index bcc6991..9e826f1 100644 --- a/spec/acceptance/basic_spec.rb +++ b/spec/acceptance/basic_spec.rb @@ -24,80 +24,6 @@ describe 'puppet-httpd module' do apply_manifest(default_puppet_module, catch_changes: true) end - describe 'required files' do - describe 'RedHat files', :if => ['fedora', 'redhat'].include?(os[:family]) do - describe file('/etc/httpd/conf.d/') do - it { should be_directory } - end - - describe file('/etc/httpd/conf.d/50-localhost.conf') do - it { should be_file } - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - its(:content) { should include '' } - end - end - - describe 'Debian files', :if => ['debian', 'ubuntu'].include?(os[:family]) do - describe file('/etc/apache2/sites-enabled/') do - it { should be_directory } - end - - describe file('/etc/apache2/sites-enabled/50-localhost.conf') do - it { should be_file } - it { should be_owned_by 'root' } - it { should be_grouped_into 'root' } - its(:content) { should include '' } - end - - describe file('/etc/apache2/mods-enabled/python.load') do - it { should be_linked_to '../mods-available/python.load' } - end - - describe file('/etc/apache2/mods-enabled/ssl.load') do - it { should be_linked_to '../mods-available/ssl.load' } - end - - describe file('/etc/apache2/mods-enabled/rewrite.load') do - it { should be_linked_to '../mods-available/rewrite.load' } - end - end - end - - describe 'required packages' do - describe 'RedHat packages', :if => ['fedora', 'redhat'].include?(os[:family]) do - required_packages = [ - package('httpd'), - package('httpd-devel'), - package('php'), - package('mod_ssl'), - ] - - required_packages.each do |package| - describe package do - it { should be_installed } - end - end - end - - describe 'Debian packages', :if => ['debian', 'ubuntu'].include?(os[:family]) do - required_packages = [ - package('apache2'), - package('apache2-dev'), - package('libaprutil1-dev'), - package('libapr1-dev'), - package('libapache2-mod-php7.0'), - package('libapache2-mod-python'), - ] - - required_packages.each do |package| - describe package do - it { should be_installed } - end - end - end - end - describe 'required services' do describe service('httpd'), :if => ['fedora', 'redhat'].include?(os[:family]) do it { should be_enabled }