From: Jonathan Boyett <jonathan@failingservers.com>
Date: Fri, 27 Jul 2012 17:54:02 +0000 (-0700)
Subject: rspec 2.11 compatibility
X-Git-Tag: 0.1.0~14^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6b107e57750ec2327d04dddc978bcc6d0dcf5fdf;p=puppet-modules%2Fpuppetlabs-firewall.git

rspec 2.11 compatibility
---

diff --git a/spec/unit/puppet/type/firewall_spec.rb b/spec/unit/puppet/type/firewall_spec.rb
index 2d1ec0b..95fff97 100755
--- a/spec/unit/puppet/type/firewall_spec.rb
+++ b/spec/unit/puppet/type/firewall_spec.rb
@@ -158,11 +158,11 @@ describe firewall do
       end
 
       it "should not accept something invalid for #{port}" do
-        expect { @resource[port] = 'something odd' }.should raise_error(Puppet::Error, /^Parameter .+ failed: Munging failed for value ".+" in class .+: no such service/)
+        expect { @resource[port] = 'something odd' }.to raise_error(Puppet::Error, /^Parameter .+ failed: Munging failed for value ".+" in class .+: no such service/)
       end
 
       it "should not accept something invalid in an array for #{port}" do
-        expect { @resource[port] = ['something odd','something even odder'] }.should raise_error(Puppet::Error, /^Parameter .+ failed: Munging failed for value ".+" in class .+: no such service/)
+        expect { @resource[port] = ['something odd','something even odder'] }.to raise_error(Puppet::Error, /^Parameter .+ failed: Munging failed for value ".+" in class .+: no such service/)
       end
     end
   end
@@ -304,7 +304,7 @@ describe firewall do
           :action => "accept",
           :jump => "custom_chain"
         )
-      }.should raise_error(Puppet::Error, /^Only one of the parameters 'action' and 'jump' can be set$/)
+      }.to raise_error(Puppet::Error, /^Only one of the parameters 'action' and 'jump' can be set$/)
     end
   end
   describe ':gid and :uid' do