summaryrefslogtreecommitdiff
path: root/spec/unit/resource
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-01-29 14:49:59 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2014-01-29 14:49:59 -0800
commit900886337d3b5dc1a4f4514aff91ba234d327bfe (patch)
treed0ea88d09f7b928260888e8f0706b32b58ccc6ef /spec/unit/resource
parentb593ff07bb7e7abf56279575e1bd8af99c7dc00f (diff)
downloadchef-900886337d3b5dc1a4f4514aff91ba234d327bfe.tar.gz
fix should_not raise_error(SpecificException)
Diffstat (limited to 'spec/unit/resource')
-rw-r--r--spec/unit/resource/cron_spec.rb4
-rw-r--r--spec/unit/resource/directory_spec.rb10
-rw-r--r--spec/unit/resource/env_spec.rb4
-rw-r--r--spec/unit/resource/erl_call_spec.rb2
-rw-r--r--spec/unit/resource/file_spec.rb16
-rw-r--r--spec/unit/resource/group_spec.rb6
-rw-r--r--spec/unit/resource/mdadm_spec.rb6
-rw-r--r--spec/unit/resource/mount_spec.rb6
-rw-r--r--spec/unit/resource/route_spec.rb4
-rw-r--r--spec/unit/resource/user_spec.rb4
-rw-r--r--spec/unit/resource/yum_package_spec.rb4
11 files changed, 33 insertions, 33 deletions
diff --git a/spec/unit/resource/cron_spec.rb b/spec/unit/resource/cron_spec.rb
index 7f294fae11..355a7f09ba 100644
--- a/spec/unit/resource/cron_spec.rb
+++ b/spec/unit/resource/cron_spec.rb
@@ -39,8 +39,8 @@ describe Chef::Resource::Cron do
end
it "should accept create or delete for action" do
- lambda { @resource.action :create }.should_not raise_error(ArgumentError)
- lambda { @resource.action :delete }.should_not raise_error(ArgumentError)
+ lambda { @resource.action :create }.should_not raise_error
+ lambda { @resource.action :delete }.should_not raise_error
lambda { @resource.action :lolcat }.should raise_error(ArgumentError)
end
diff --git a/spec/unit/resource/directory_spec.rb b/spec/unit/resource/directory_spec.rb
index dc042c5a77..a42383c49e 100644
--- a/spec/unit/resource/directory_spec.rb
+++ b/spec/unit/resource/directory_spec.rb
@@ -39,8 +39,8 @@ describe Chef::Resource::Directory do
end
it "should accept create or delete for action" do
- lambda { @resource.action :create }.should_not raise_error(ArgumentError)
- lambda { @resource.action :delete }.should_not raise_error(ArgumentError)
+ lambda { @resource.action :create }.should_not raise_error
+ lambda { @resource.action :delete }.should_not raise_error
lambda { @resource.action :blues }.should raise_error(ArgumentError)
end
@@ -49,14 +49,14 @@ describe Chef::Resource::Directory do
end
it "should accept a string as the path" do
- lambda { @resource.path "/tmp" }.should_not raise_error(ArgumentError)
+ lambda { @resource.path "/tmp" }.should_not raise_error
@resource.path.should eql("/tmp")
lambda { @resource.path Hash.new }.should raise_error(ArgumentError)
end
it "should allow you to have specify whether the action is recursive with true/false" do
- lambda { @resource.recursive true }.should_not raise_error(ArgumentError)
- lambda { @resource.recursive false }.should_not raise_error(ArgumentError)
+ lambda { @resource.recursive true }.should_not raise_error
+ lambda { @resource.recursive false }.should_not raise_error
lambda { @resource.recursive "monkey" }.should raise_error(ArgumentError)
end
diff --git a/spec/unit/resource/env_spec.rb b/spec/unit/resource/env_spec.rb
index b53cbe478f..a1f599400b 100644
--- a/spec/unit/resource/env_spec.rb
+++ b/spec/unit/resource/env_spec.rb
@@ -43,7 +43,7 @@ describe Chef::Resource::Env do
if bad_value
lambda { @resource.action action }.should raise_error(ArgumentError)
else
- lambda { @resource.action action }.should_not raise_error(ArgumentError)
+ lambda { @resource.action action }.should_not raise_error
end
end
end
@@ -53,7 +53,7 @@ describe Chef::Resource::Env do
end
it "should accept a string as the env value via 'value'" do
- lambda { @resource.value "bar" }.should_not raise_error(ArgumentError)
+ lambda { @resource.value "bar" }.should_not raise_error
end
it "should not accept a Hash for the env value via 'to'" do
diff --git a/spec/unit/resource/erl_call_spec.rb b/spec/unit/resource/erl_call_spec.rb
index 49df9639d1..3efbdca9a0 100644
--- a/spec/unit/resource/erl_call_spec.rb
+++ b/spec/unit/resource/erl_call_spec.rb
@@ -39,7 +39,7 @@ describe Chef::Resource::ErlCall do
end
it "should accept run as an action" do
- lambda { @resource.action :run }.should_not raise_error(ArgumentError)
+ lambda { @resource.action :run }.should_not raise_error
end
it "should allow you to set the code attribute" do
diff --git a/spec/unit/resource/file_spec.rb b/spec/unit/resource/file_spec.rb
index f937d0035b..9c6365f6d3 100644
--- a/spec/unit/resource/file_spec.rb
+++ b/spec/unit/resource/file_spec.rb
@@ -44,25 +44,25 @@ describe Chef::Resource::File do
lambda { @resource.content 5 }.should raise_error(ArgumentError)
lambda { @resource.content :foo }.should raise_error(ArgumentError)
lambda { @resource.content "hello" => "there" }.should raise_error(ArgumentError)
- lambda { @resource.content "hi" }.should_not raise_error(ArgumentError)
+ lambda { @resource.content "hi" }.should_not raise_error
end
it "should only accept false or a number for backup" do
lambda { @resource.backup true }.should raise_error(ArgumentError)
- lambda { @resource.backup false }.should_not raise_error(ArgumentError)
- lambda { @resource.backup 10 }.should_not raise_error(ArgumentError)
+ lambda { @resource.backup false }.should_not raise_error
+ lambda { @resource.backup 10 }.should_not raise_error
lambda { @resource.backup "blues" }.should raise_error(ArgumentError)
end
it "should accept a sha256 for checksum" do
- lambda { @resource.checksum "0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa" }.should_not raise_error(ArgumentError)
+ lambda { @resource.checksum "0fd012fdc96e96f8f7cf2046522a54aed0ce470224513e45da6bc1a17a4924aa" }.should_not raise_error
lambda { @resource.checksum "monkey!" }.should raise_error(ArgumentError)
end
it "should accept create, delete or touch for action" do
- lambda { @resource.action :create }.should_not raise_error(ArgumentError)
- lambda { @resource.action :delete }.should_not raise_error(ArgumentError)
- lambda { @resource.action :touch }.should_not raise_error(ArgumentError)
+ lambda { @resource.action :create }.should_not raise_error
+ lambda { @resource.action :delete }.should_not raise_error
+ lambda { @resource.action :touch }.should_not raise_error
lambda { @resource.action :blues }.should raise_error(ArgumentError)
end
@@ -71,7 +71,7 @@ describe Chef::Resource::File do
end
it "should accept a string as the path" do
- lambda { @resource.path "/tmp" }.should_not raise_error(ArgumentError)
+ lambda { @resource.path "/tmp" }.should_not raise_error
@resource.path.should eql("/tmp")
lambda { @resource.path Hash.new }.should raise_error(ArgumentError)
end
diff --git a/spec/unit/resource/group_spec.rb b/spec/unit/resource/group_spec.rb
index df68c5691f..0c3cf4f67f 100644
--- a/spec/unit/resource/group_spec.rb
+++ b/spec/unit/resource/group_spec.rb
@@ -60,11 +60,11 @@ describe Chef::Resource::Group, "initialize" do
end
it "should accept domain groups (@ or \ separator) on non-windows" do
- lambda { @resource.group_name "domain\@group" }.should_not raise_error(ArgumentError)
+ lambda { @resource.group_name "domain\@group" }.should_not raise_error
@resource.group_name.should == "domain\@group"
- lambda { @resource.group_name "domain\\group" }.should_not raise_error(ArgumentError)
+ lambda { @resource.group_name "domain\\group" }.should_not raise_error
@resource.group_name.should == "domain\\group"
- lambda { @resource.group_name "domain\\group^name" }.should_not raise_error(ArgumentError)
+ lambda { @resource.group_name "domain\\group^name" }.should_not raise_error
@resource.group_name.should == "domain\\group^name"
end
end
diff --git a/spec/unit/resource/mdadm_spec.rb b/spec/unit/resource/mdadm_spec.rb
index 310f420659..daf10bcfea 100644
--- a/spec/unit/resource/mdadm_spec.rb
+++ b/spec/unit/resource/mdadm_spec.rb
@@ -39,9 +39,9 @@ describe Chef::Resource::Mdadm do
end
it "should accept create, assemble, stop as actions" do
- lambda { @resource.action :create }.should_not raise_error(ArgumentError)
- lambda { @resource.action :assemble }.should_not raise_error(ArgumentError)
- lambda { @resource.action :stop }.should_not raise_error(ArgumentError)
+ lambda { @resource.action :create }.should_not raise_error
+ lambda { @resource.action :assemble }.should_not raise_error
+ lambda { @resource.action :stop }.should_not raise_error
end
it "should allow you to set the raid_device attribute" do
diff --git a/spec/unit/resource/mount_spec.rb b/spec/unit/resource/mount_spec.rb
index fb414018ba..c80f6971f1 100644
--- a/spec/unit/resource/mount_spec.rb
+++ b/spec/unit/resource/mount_spec.rb
@@ -42,9 +42,9 @@ describe Chef::Resource::Mount do
end
it "should accept mount, umount and remount as actions" do
- lambda { @resource.action :mount }.should_not raise_error(ArgumentError)
- lambda { @resource.action :umount }.should_not raise_error(ArgumentError)
- lambda { @resource.action :remount }.should_not raise_error(ArgumentError)
+ lambda { @resource.action :mount }.should_not raise_error
+ lambda { @resource.action :umount }.should_not raise_error
+ lambda { @resource.action :remount }.should_not raise_error
lambda { @resource.action :brooklyn }.should raise_error(ArgumentError)
end
diff --git a/spec/unit/resource/route_spec.rb b/spec/unit/resource/route_spec.rb
index bca42f1101..4522438402 100644
--- a/spec/unit/resource/route_spec.rb
+++ b/spec/unit/resource/route_spec.rb
@@ -39,8 +39,8 @@ describe Chef::Resource::Route do
end
it "should accept add or delete for action" do
- lambda { @resource.action :add }.should_not raise_error(ArgumentError)
- lambda { @resource.action :delete }.should_not raise_error(ArgumentError)
+ lambda { @resource.action :add }.should_not raise_error
+ lambda { @resource.action :delete }.should_not raise_error
lambda { @resource.action :lolcat }.should raise_error(ArgumentError)
end
diff --git a/spec/unit/resource/user_spec.rb b/spec/unit/resource/user_spec.rb
index caf12aa416..9972ddbba1 100644
--- a/spec/unit/resource/user_spec.rb
+++ b/spec/unit/resource/user_spec.rb
@@ -61,9 +61,9 @@ describe Chef::Resource::User, "initialize" do
end
it "should accept domain users (@ or \ separator) on non-windows" do
- lambda { @resource.username "domain\@user" }.should_not raise_error(ArgumentError)
+ lambda { @resource.username "domain\@user" }.should_not raise_error
@resource.username.should == "domain\@user"
- lambda { @resource.username "domain\\user" }.should_not raise_error(ArgumentError)
+ lambda { @resource.username "domain\\user" }.should_not raise_error
@resource.username.should == "domain\\user"
end
end
diff --git a/spec/unit/resource/yum_package_spec.rb b/spec/unit/resource/yum_package_spec.rb
index 783a539eb2..57ab4dfcd9 100644
--- a/spec/unit/resource/yum_package_spec.rb
+++ b/spec/unit/resource/yum_package_spec.rb
@@ -78,8 +78,8 @@ describe Chef::Resource::YumPackage, "allow_downgrade" do
end
it "should allow you to specify whether allow_downgrade is true or false" do
- lambda { @resource.allow_downgrade true }.should_not raise_error(ArgumentError)
- lambda { @resource.allow_downgrade false }.should_not raise_error(ArgumentError)
+ lambda { @resource.allow_downgrade true }.should_not raise_error
+ lambda { @resource.allow_downgrade false }.should_not raise_error
lambda { @resource.allow_downgrade "monkey" }.should raise_error(ArgumentError)
end
end