diff --git a/.fixtures.yml b/.fixtures.yml index 3acc64c..a0ee02e 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,6 +1,7 @@ fixtures: repositories: apache: 'git://github.com/puppetlabs/puppetlabs-apache.git' + concat: 'git://github.com/puppetlabs/puppetlabs-concat.git' stdlib: 'git://github.com/puppetlabs/puppetlabs-stdlib.git' vcsrepo: 'git://github.com/puppetlabs/puppetlabs-vcsrepo.git' diff --git a/spec/classes/icingaweb2_spec.rb b/spec/classes/icingaweb2_spec.rb index 3aa13bb..6ac053d 100644 --- a/spec/classes/icingaweb2_spec.rb +++ b/spec/classes/icingaweb2_spec.rb @@ -255,6 +255,7 @@ describe 'icingaweb2', :type => :class do end describe 'with parameter: manage_apache_vhost' do + let (:pre_condition) { '$concat_basedir = "/tmp"' } context 'manage_apache_vhost => true' do let (:params) { { :manage_apache_vhost => true } } @@ -312,6 +313,7 @@ describe 'icingaweb2', :type => :class do end describe 'with parameter: web_root' do + let (:pre_condition) { '$concat_basedir = "/tmp"' } context 'default' do let (:params) { { :web_root => '/web/root' } } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 391ff92..a68983b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -14,14 +14,16 @@ end def centos_facts { - :operatingsystem => 'CentOS', - :osfamily => 'RedHat', + :operatingsystem => 'CentOS', + :osfamily => 'RedHat', + :operatingsystemrelease => '6', } end def debian_facts { - :operatingsystem => 'Debian', - :osfamily => 'Debian', + :operatingsystem => 'Debian', + :osfamily => 'Debian', + :operatingsystemrelease => '7', } end