make #verify_contents usage compatible with rspec-puppet > 1.0.1

The verify_contents method invocations have been updated to work with rspec-puppet 1.0.1+ but are now incompatible with <= 1.0.1 rodjek/rspec-puppet#235
samuraiii · Nov 18, 2014 · e80c3aa · e80c3aa
1 parent d5daf1e
commit e80c3aa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -10,6 +10,9 @@ gem 'rake',                   :require => false
 gem 'puppetlabs_spec_helper', :require => false
 gem 'puppet-lint',            :require => false
 gem 'puppet-syntax',          :require => false
+# The verify_contents method invocations have been updated to work with
+# rspec-puppet 1.0.1+ but are now incompatible with <= 1.0.1
+# https://github.com/rodjek/rspec-puppet/issues/235
 gem 'rspec-puppet',
   :git => 'https://github.com/rodjek/rspec-puppet.git',
   :ref => '6ac97993fa972a15851a73d55fe3d1c0a85172b5',

diff --git a/spec/unit/classes/smartd_spec.rb b/spec/unit/classes/smartd_spec.rb
@@ -30,7 +30,7 @@
       })
     end
     it "should contain File[#{config_file}] with correct contents" do
-      verify_contents(subject, config_file, content)
+      verify_contents(catalogue, config_file, content)
     end
   end
 
@@ -229,7 +229,7 @@
 
       it { should contain_file('/etc/smartd.conf').with_ensure('present') }
       it 'should contain file /etc/smartd.conf with contents ...' do
-        verify_contents(subject, '/etc/smartd.conf', [
+        verify_contents(catalogue, '/etc/smartd.conf', [
           'DEFAULT -m root -M daily',
           'DEVICESCAN somevalue',
         ])
@@ -248,7 +248,7 @@
 
       it { should contain_file('/etc/smartd.conf').with_ensure('present') }
       it 'should contain file /etc/smartd.conf with contents ...' do
-        verify_contents(subject, '/etc/smartd.conf', [
+        verify_contents(catalogue, '/etc/smartd.conf', [
           'DEFAULT -m root -M daily',
           '/dev/sg1',
           '/dev/sg2',
@@ -268,7 +268,7 @@
 
       it { should contain_file('/etc/smartd.conf').with_ensure('present') }
       it 'should contain file /etc/smartd.conf with contents ...' do
-        verify_contents(subject, '/etc/smartd.conf', [
+        verify_contents(catalogue, '/etc/smartd.conf', [
           'DEFAULT -m root -M daily',
           '/dev/sg1 -o on -S on -a',
           '/dev/sg2 -o on -S on -a',
@@ -293,7 +293,7 @@
 
       it { should contain_file('/etc/smartd.conf').with_ensure('present') }
       it 'should contain file /etc/smartd.conf with contents ...' do
-        verify_contents(subject, '/etc/smartd.conf', [
+        verify_contents(catalogue, '/etc/smartd.conf', [
           'DEFAULT -m root -M daily',
           '/dev/cciss/c0d0 -d cciss,0 -a -o on -S on',
           '/dev/cciss/c0d0 -d cciss,1 -a -o on -S on',
@@ -310,7 +310,7 @@
 
       it { should contain_file('/etc/smartd.conf').with_ensure('present') }
       it 'should contain file /etc/smartd.conf with contents ...' do
-        verify_contents(subject, '/etc/smartd.conf', [
+        verify_contents(catalogue, '/etc/smartd.conf', [
           'DEFAULT -m someguy@localdomain -M daily',
         ])
       end
@@ -321,7 +321,7 @@
 
       it { should contain_file('/etc/smartd.conf').with_ensure('present') }
       it 'should contain file /etc/smartd.conf with contents ...' do
-        verify_contents(subject, '/etc/smartd.conf', [
+        verify_contents(catalogue, '/etc/smartd.conf', [
           'DEFAULT -m root -M diminishing',
         ])
       end