Fix rspec errors

This commit is contained in:
Tom De Vylder 2015-02-20 21:29:07 +01:00
parent fcceebcfcf
commit 2f701621ae
3 changed files with 9 additions and 4 deletions

View file

@ -1,6 +1,7 @@
fixtures: fixtures:
repositories: repositories:
apache: 'git://github.com/puppetlabs/puppetlabs-apache.git' apache: 'git://github.com/puppetlabs/puppetlabs-apache.git'
concat: 'git://github.com/puppetlabs/puppetlabs-concat.git'
stdlib: 'git://github.com/puppetlabs/puppetlabs-stdlib.git' stdlib: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
vcsrepo: 'git://github.com/puppetlabs/puppetlabs-vcsrepo.git' vcsrepo: 'git://github.com/puppetlabs/puppetlabs-vcsrepo.git'

View file

@ -255,6 +255,7 @@ describe 'icingaweb2', :type => :class do
end end
describe 'with parameter: manage_apache_vhost' do describe 'with parameter: manage_apache_vhost' do
let (:pre_condition) { '$concat_basedir = "/tmp"' }
context 'manage_apache_vhost => true' do context 'manage_apache_vhost => true' do
let (:params) { { :manage_apache_vhost => true } } let (:params) { { :manage_apache_vhost => true } }
@ -312,6 +313,7 @@ describe 'icingaweb2', :type => :class do
end end
describe 'with parameter: web_root' do describe 'with parameter: web_root' do
let (:pre_condition) { '$concat_basedir = "/tmp"' }
context 'default' do context 'default' do
let (:params) { { :web_root => '/web/root' } } let (:params) { { :web_root => '/web/root' } }

View file

@ -14,14 +14,16 @@ end
def centos_facts def centos_facts
{ {
:operatingsystem => 'CentOS', :operatingsystem => 'CentOS',
:osfamily => 'RedHat', :osfamily => 'RedHat',
:operatingsystemrelease => '6',
} }
end end
def debian_facts def debian_facts
{ {
:operatingsystem => 'Debian', :operatingsystem => 'Debian',
:osfamily => 'Debian', :osfamily => 'Debian',
:operatingsystemrelease => '7',
} }
end end