fix should_not raise_error(SpecificException)

13 files changed, 23 insertions, 23 deletions

diff --git a/spec/unit/provider/git_spec.rb b/spec/unit/provider/git_spec.rb
index 416012f5fa..b18a2a8996 100644
--- a/spec/unit/provider/git_spec.rb
+++ b/spec/unit/provider/git_spec.rb
@@ -135,7 +135,7 @@ describe Chef::Provider::Git do
       @provider.action = :checkout
       ::File.stub(:directory?).with("/my/deploy").and_return(true)
       @provider.define_resource_requirements
-      lambda { @provider.process_resource_requirements }.should_not raise_error(RuntimeError)
+      lambda { @provider.process_resource_requirements }.should_not raise_error
     end
 
     it "gives the latest HEAD revision SHA if nothing is specified" do
diff --git a/spec/unit/provider/group/dscl_spec.rb b/spec/unit/provider/group/dscl_spec.rb
index 6eb85f7417..e29e24f9b2 100644
--- a/spec/unit/provider/group/dscl_spec.rb
+++ b/spec/unit/provider/group/dscl_spec.rb
@@ -247,7 +247,7 @@ describe Chef::Provider::Group::Dscl do
 
     it "doesn't raise an error if /usr/bin/dscl exists" do
       File.stub(:exists?).and_return(true)
-      lambda { @provider.process_resource_requirements }.should_not raise_error(Chef::Exceptions::Group)
+      lambda { @provider.process_resource_requirements }.should_not raise_error
     end
   end
 
diff --git a/spec/unit/provider/group/gpasswd_spec.rb b/spec/unit/provider/group/gpasswd_spec.rb
index 0436812501..7d71ecdb41 100644
--- a/spec/unit/provider/group/gpasswd_spec.rb
+++ b/spec/unit/provider/group/gpasswd_spec.rb
@@ -47,7 +47,7 @@ describe Chef::Provider::Group::Gpasswd, "modify_group_members" do
 
     it "shouldn't raise an error if the required binaries exist" do
       File.stub(:exists?).and_return(true)
-      lambda { @provider.process_resource_requirements }.should_not raise_error(Chef::Exceptions::Group)
+      lambda { @provider.process_resource_requirements }.should_not raise_error
     end
   end
 
diff --git a/spec/unit/provider/group/groupmod_spec.rb b/spec/unit/provider/group/groupmod_spec.rb
index 3d49f667d4..001f9c66e8 100644
--- a/spec/unit/provider/group/groupmod_spec.rb
+++ b/spec/unit/provider/group/groupmod_spec.rb
@@ -44,7 +44,7 @@ describe Chef::Provider::Group::Groupmod do
 
       it "shouldn't raise an error if the required binaries exist" do
         File.stub(:exists?).and_return(true)
-        lambda { @provider.load_current_resource }.should_not raise_error(Chef::Exceptions::Group)
+        lambda { @provider.load_current_resource }.should_not raise_error
       end
     end
 
diff --git a/spec/unit/provider/group/pw_spec.rb b/spec/unit/provider/group/pw_spec.rb
index 103bc33bd4..e622edbef3 100644
--- a/spec/unit/provider/group/pw_spec.rb
+++ b/spec/unit/provider/group/pw_spec.rb
@@ -131,7 +131,7 @@ describe Chef::Provider::Group::Pw do
 
     it "shouldn't raise an error if /usr/sbin/pw exists" do
       File.stub(:exists?).and_return(true)
-      lambda { @provider.process_resource_requirements }.should_not raise_error(Chef::Exceptions::Group)
+      lambda { @provider.process_resource_requirements }.should_not raise_error
     end
   end
 end
diff --git a/spec/unit/provider/group/usermod_spec.rb b/spec/unit/provider/group/usermod_spec.rb
index cc3a28fb74..45b6aad8aa 100644
--- a/spec/unit/provider/group/usermod_spec.rb
+++ b/spec/unit/provider/group/usermod_spec.rb
@@ -107,7 +107,7 @@ describe Chef::Provider::Group::Usermod do
 
     it "shouldn't raise an error if the required binaries exist" do
       File.stub(:exists?).and_return(true)
-      lambda { @provider.process_resource_requirements }.should_not raise_error(Chef::Exceptions::Group)
+      lambda { @provider.process_resource_requirements }.should_not raise_error
     end
   end
 end
diff --git a/spec/unit/provider/package/pacman_spec.rb b/spec/unit/provider/package/pacman_spec.rb
index 83f376431e..528f7097e8 100644
--- a/spec/unit/provider/package/pacman_spec.rb
+++ b/spec/unit/provider/package/pacman_spec.rb
@@ -139,7 +139,7 @@ PACMAN_CONF
 
     it "should not raise an exception if pacman succeeds" do
       @status.should_receive(:exitstatus).and_return(0)
-      lambda { @provider.load_current_resource }.should_not raise_error(Chef::Exceptions::Package)
+      lambda { @provider.load_current_resource }.should_not raise_error
     end
 
     it "should raise an exception if pacman does not return a candidate version" do
diff --git a/spec/unit/provider/package/yum_spec.rb b/spec/unit/provider/package/yum_spec.rb
index 8a947c2b2d..adbcd86722 100644
--- a/spec/unit/provider/package/yum_spec.rb
+++ b/spec/unit/provider/package/yum_spec.rb
@@ -1690,8 +1690,8 @@ EOF
 
   describe "installed_version" do
     it "should take one or two arguments" do
-      lambda { @yc.installed_version("zip") }.should_not raise_error(ArgumentError)
-      lambda { @yc.installed_version("zip", "i386") }.should_not raise_error(ArgumentError)
+      lambda { @yc.installed_version("zip") }.should_not raise_error
+      lambda { @yc.installed_version("zip", "i386") }.should_not raise_error
       lambda { @yc.installed_version("zip", "i386", "extra") }.should raise_error(ArgumentError)
     end
 
@@ -1714,8 +1714,8 @@ EOF
 
   describe "available_version" do
     it "should take one or two arguments" do
-      lambda { @yc.available_version("zisofs-tools") }.should_not raise_error(ArgumentError)
-      lambda { @yc.available_version("zisofs-tools", "i386") }.should_not raise_error(ArgumentError)
+      lambda { @yc.available_version("zisofs-tools") }.should_not raise_error
+      lambda { @yc.available_version("zisofs-tools", "i386") }.should_not raise_error
       lambda { @yc.available_version("zisofs-tools", "i386", "extra") }.should raise_error(ArgumentError)
     end
 
@@ -1739,8 +1739,8 @@ EOF
   describe "version_available?" do
     it "should take two or three arguments" do
       lambda { @yc.version_available?("zisofs-tools") }.should raise_error(ArgumentError)
-      lambda { @yc.version_available?("zisofs-tools", "1.0.6-3.2.2") }.should_not raise_error(ArgumentError)
-      lambda { @yc.version_available?("zisofs-tools", "1.0.6-3.2.2", "x86_64") }.should_not raise_error(ArgumentError)
+      lambda { @yc.version_available?("zisofs-tools", "1.0.6-3.2.2") }.should_not raise_error
+      lambda { @yc.version_available?("zisofs-tools", "1.0.6-3.2.2", "x86_64") }.should_not raise_error
     end
 
     it "should return true if our package-version-arch is available" do
@@ -1768,8 +1768,8 @@ EOF
   describe "package_repository" do
     it "should take two or three arguments" do
       lambda { @yc.package_repository("zisofs-tools") }.should raise_error(ArgumentError)
-      lambda { @yc.package_repository("zisofs-tools", "1.0.6-3.2.2") }.should_not raise_error(ArgumentError)
-      lambda { @yc.package_repository("zisofs-tools", "1.0.6-3.2.2", "x86_64") }.should_not raise_error(ArgumentError)
+      lambda { @yc.package_repository("zisofs-tools", "1.0.6-3.2.2") }.should_not raise_error
+      lambda { @yc.package_repository("zisofs-tools", "1.0.6-3.2.2", "x86_64") }.should_not raise_error
     end
 
     it "should return repoid for package-version-arch" do
diff --git a/spec/unit/provider/package/zypper_spec.rb b/spec/unit/provider/package/zypper_spec.rb
index e63ac5160e..c437631309 100644
--- a/spec/unit/provider/package/zypper_spec.rb
+++ b/spec/unit/provider/package/zypper_spec.rb
@@ -82,7 +82,7 @@ describe Chef::Provider::Package::Zypper do
 
     it "should not raise an exception if zypper info succeeds" do
       @status.should_receive(:exitstatus).and_return(0)
-      lambda { @provider.load_current_resource }.should_not raise_error(Chef::Exceptions::Package)
+      lambda { @provider.load_current_resource }.should_not raise_error
     end
 
     it "should return the current resouce" do
diff --git a/spec/unit/provider/service/freebsd_service_spec.rb b/spec/unit/provider/service/freebsd_service_spec.rb
index 4ebfe12b49..820dfb8dc7 100644
--- a/spec/unit/provider/service/freebsd_service_spec.rb
+++ b/spec/unit/provider/service/freebsd_service_spec.rb
@@ -75,7 +75,7 @@ RC_SAMPLE
 
     it "should not raise an exception if the rcscript have a name variable" do
       @provider.load_current_resource
-      lambda { @provider.service_enable_variable_name }.should_not raise_error(Chef::Exceptions::Service)
+      lambda { @provider.service_enable_variable_name }.should_not raise_error
     end
 
     describe "when the service supports status" do
@@ -294,7 +294,7 @@ RCVAR_SAMPLE
 
         it "should not raise an exception if the rcscript does not have a name variable" do
           @provider.load_current_resource
-          lambda { @provider.service_enable_variable_name }.should_not raise_error(Chef::Exceptions::Service)
+          lambda { @provider.service_enable_variable_name }.should_not raise_error
         end
       end
 
@@ -323,7 +323,7 @@ RCVAR_SAMPLE
             @provider.action = action
             @provider.load_current_resource
             @provider.define_resource_requirements
-            lambda { @provider.process_resource_requirements }.should_not raise_error(Chef::Exceptions::Service)
+            lambda { @provider.process_resource_requirements }.should_not raise_error
           end
         end
       end
diff --git a/spec/unit/provider/service/init_service_spec.rb b/spec/unit/provider/service/init_service_spec.rb
index 9b0371a270..ad887c84a5 100644
--- a/spec/unit/provider/service/init_service_spec.rb
+++ b/spec/unit/provider/service/init_service_spec.rb
@@ -229,7 +229,7 @@ RUNNING_PS
     end
 
     it "should still pass all why run assertions" do
-      lambda { @provider.run_action(:start) }.should_not raise_error(Chef::Exceptions::Service)
+      lambda { @provider.run_action(:start) }.should_not raise_error
     end
   end
 end
diff --git a/spec/unit/provider/user/dscl_spec.rb b/spec/unit/provider/user/dscl_spec.rb
index 2e0de1364c..c7657aa6e5 100644
--- a/spec/unit/provider/user/dscl_spec.rb
+++ b/spec/unit/provider/user/dscl_spec.rb
@@ -325,7 +325,7 @@ describe Chef::Provider::User::Dscl do
 
     it "shouldn't raise an error if /usr/bin/dscl exists" do
       ::File.stub(:exists?).and_return(true)
-      lambda { @provider.load_current_resource }.should_not raise_error(Chef::Exceptions::User)
+      lambda { @provider.load_current_resource }.should_not raise_error
     end
   end
 
diff --git a/spec/unit/provider/user/pw_spec.rb b/spec/unit/provider/user/pw_spec.rb
index e5ebcb370a..1d5ad38c9c 100644
--- a/spec/unit/provider/user/pw_spec.rb
+++ b/spec/unit/provider/user/pw_spec.rb
@@ -212,7 +212,7 @@ describe Chef::Provider::User::Pw do
 
       it "should not raise an exception if pw usermod succeeds" do
         @status.should_receive(:exitstatus).and_return(0)
-        lambda { @provider.modify_password }.should_not raise_error(Chef::Exceptions::User)
+        lambda { @provider.modify_password }.should_not raise_error
       end
     end
   end
@@ -229,7 +229,7 @@ describe Chef::Provider::User::Pw do
 
     it "shouldn't raise an error if /usr/sbin/pw exists" do
       File.stub(:exists?).and_return(true)
-      lambda { @provider.load_current_resource }.should_not raise_error(Chef::Exceptions::User)
+      lambda { @provider.load_current_resource }.should_not raise_error
     end
   end
 end