summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@loftninjas.org>2014-10-13 16:31:40 -0400
committerSerdar Sutay <serdar@opscode.com>2014-10-30 12:17:18 -0700
commit97775f29456e8de757324a25ab668a1f457a2e44 (patch)
tree9a8c6456e5c311d89e41bc1d56cd0ce1c0de3a76
parent055edb751cb4ba1e4aaec49a2b419d0b30e3d9a7 (diff)
downloadchef-97775f29456e8de757324a25ab668a1f457a2e44.tar.gz
windows_package installer_type should be a symbol
Fixes #1997 Conflicts: spec/unit/resource/windows_package_spec.rb
-rw-r--r--lib/chef/resource/windows_package.rb2
-rw-r--r--spec/unit/resource/windows_package_spec.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/resource/windows_package.rb b/lib/chef/resource/windows_package.rb
index 7b3361402c..b1ef2c288e 100644
--- a/lib/chef/resource/windows_package.rb
+++ b/lib/chef/resource/windows_package.rb
@@ -44,7 +44,7 @@ class Chef
set_or_return(
:installer_type,
arg,
- :kind_of => [ String ]
+ :kind_of => [ Symbol ]
)
end
diff --git a/spec/unit/resource/windows_package_spec.rb b/spec/unit/resource/windows_package_spec.rb
index fed029f9fe..1e02f2449b 100644
--- a/spec/unit/resource/windows_package_spec.rb
+++ b/spec/unit/resource/windows_package_spec.rb
@@ -41,9 +41,9 @@ describe Chef::Resource::WindowsPackage, "initialize" do
expect(resource.resource_name).to eql(:windows_package)
end
- it "supports setting installer_type" do
- resource.installer_type("msi")
- expect(resource.installer_type).to eql("msi")
+ it "supports setting installer_type as a symbol" do
+ resource.installer_type(:msi)
+ expect(resource.installer_type).to eql(:msi)
end
# String, Integer