Explorar el Código

Fix rspec errors

Tom De Vylder hace 9 años
padre
commit
2f701621ae
Se han modificado 3 ficheros con 9 adiciones y 4 borrados
  1. 1 0
      .fixtures.yml
  2. 2 0
      spec/classes/icingaweb2_spec.rb
  3. 6 4
      spec/spec_helper.rb

+ 1 - 0
.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'
 

+ 2 - 0
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' } }
 

+ 6 - 4
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