Return node from Chef::Client#build_node

2 files changed, 4 insertions, 1 deletions

diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index 3b50874db9..b690dfb9a4 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -234,6 +234,7 @@ class Chef
     def build_node
       policy_builder.build_node
       @run_status = Chef::RunStatus.new(node, events)
+      node
     end
 
     def setup_run_context
diff --git a/spec/unit/client_spec.rb b/spec/unit/client_spec.rb
index 6b7dd36930..f33f8d494c 100644
--- a/spec/unit/client_spec.rb
+++ b/spec/unit/client_spec.rb
@@ -333,7 +333,9 @@ shared_examples_for Chef::Client do
       @node[:recipes].should be_nil
 
       @client.policy_builder.stub!(:node).and_return(@node)
-      @client.policy_builder.build_node
+
+      # chefspec and possibly others use the return value of this method
+      @client.build_node.should == @node
 
       # check post-conditions.
       @node[:roles].should_not be_nil