diff options
| author | Ranjib Dey <ranjib@pagerduty.com> | 2015-06-12 23:51:14 -0700 |
|---|---|---|
| committer | Ranjib Dey <ranjib@pagerduty.com> | 2015-06-12 23:51:14 -0700 |
| commit | 414b3b2bea634c48f6c1996b0e7a5884cc3ad2c7 (patch) | |
| tree | a9a9f750021114e0b6f8d46145ae8dee2b9f8ac4 /spec/unit/resource/powershell_spec.rb | |
| parent | fdde9a0a476c407d34882631b50406cf585c6602 (diff) | |
| parent | b08c9010c387c762a6fa82fa9ae8c2a5e5c8594d (diff) | |
| download | chef-414b3b2bea634c48f6c1996b0e7a5884cc3ad2c7.tar.gz | |
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts:
lib/chef/chef_class.rb
Diffstat (limited to 'spec/unit/resource/powershell_spec.rb')
| -rw-r--r-- | spec/unit/resource/powershell_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/unit/resource/powershell_spec.rb b/spec/unit/resource/powershell_spec.rb index c263172ae6..2505c4a3d7 100644 --- a/spec/unit/resource/powershell_spec.rb +++ b/spec/unit/resource/powershell_spec.rb @@ -25,6 +25,7 @@ describe Chef::Resource::PowershellScript do node.default["kernel"] = Hash.new node.default["kernel"][:machine] = :x86_64.to_s + node.automatic[:os] = 'windows' run_context = Chef::RunContext.new(node, nil, nil) |