Skip to content

Commit 521d220

Browse files
committed
Fixing Chef::Runner specs to reflect Ohai
1 parent df2d588 commit 521d220

1 file changed

Lines changed: 16 additions & 14 deletions

File tree

chef/spec/unit/runner_spec.rb

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,20 @@
1919
require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
2020

2121
describe Chef::Runner do
22+
def new_runner
23+
@node = Chef::Node.new
24+
@node.name "latte"
25+
@node.platform "mac_os_x"
26+
@node.platform_version "10.5.1"
27+
@collection = Chef::ResourceCollection.new()
28+
@collection << Chef::Resource::Cat.new("loulou", @collection)
29+
Chef::Platform.set(
30+
:resource => :cat,
31+
:provider => Chef::Provider::SnakeOil
32+
)
33+
@runner = Chef::Runner.new(@node, @collection)
34+
end
35+
2236
before(:each) do
2337
@mock_node = mock("Node", :null_object => true)
2438
@mock_collection = mock("Resource Collection", :null_object => true)
@@ -65,7 +79,7 @@
6579
@runner.converge
6680
end
6781

68-
it "should check a resources only_if, if it is provided" do
82+
it "should not check a resources only_if if it is not provided" do
6983
@collection[0].should_receive(:only_if).and_return(nil)
7084
@runner.converge
7185
end
@@ -126,17 +140,5 @@
126140
@runner.converge
127141
end
128142

129-
def new_runner
130-
@node = Chef::Node.new
131-
@node.name "latte"
132-
@node.operatingsystem "mac_os_x"
133-
@node.operatingsystemversion "10.5.1"
134-
@collection = Chef::ResourceCollection.new()
135-
@collection << Chef::Resource::Cat.new("loulou", @collection)
136-
Chef::Platform.set(
137-
:resource => :cat,
138-
:provider => Chef::Provider::SnakeOil
139-
)
140-
@runner = Chef::Runner.new(@node, @collection)
141-
end
143+
142144
end

0 commit comments

Comments
 (0)