[CHEF-3724] correctly query the recipes attribute in Node#recipe?

Also, coerce node[:recipes] to an Array so that Node#recipe? will work
correctly when the recipes attribute has not been set.

2 files changed, 31 insertions, 1 deletions

diff --git a/lib/chef/node.rb b/lib/chef/node.rb
index d079c8aeff..a2bffcc172 100644
--- a/lib/chef/node.rb
+++ b/lib/chef/node.rb
@@ -241,7 +241,7 @@ class Chef
     #
     # NOTE: It's used by cookbook authors
     def recipe?(recipe_name)
-      run_list.include?(recipe_name) || self[recipes].include?(recipe_name)
+      run_list.include?(recipe_name) || Array(self[:recipes]).include?(recipe_name)
     end
 
     # Returns true if this Node expects a given role, false if not.
diff --git a/spec/unit/node_spec.rb b/spec/unit/node_spec.rb
index f8cfd39deb..d785f84c73 100644
--- a/spec/unit/node_spec.rb
+++ b/spec/unit/node_spec.rb
@@ -404,6 +404,36 @@ describe Chef::Node do
     end
   end
 
+  describe "when querying for recipes in the run list" do
+    context "when a recipe is in the top level run list" do
+      before do
+        node.run_list << "recipe[nginx::module]"
+      end
+
+      it "finds the recipe" do
+        node.recipe?("nginx::module").should be_true
+      end
+
+      it "does not find a recipe not in the run list" do
+        node.recipe?("nginx::other_module").should be_false
+      end
+    end
+    context "when a recipe is in the expanded run list only" do
+      before do
+        node.run_list << "role[base]"
+        node.automatic_attrs[:recipes] = [ "nginx::module" ]
+      end
+
+      it "finds a recipe in the expanded run list" do
+        node.recipe?("nginx::module").should be_true
+      end
+
+      it "does not find a recipe that's not in the run list" do
+        node.recipe?("nginx::other_module").should be_false
+      end
+    end
+  end
+
   describe "when clearing computed state at the beginning of a run" do
     before do
       node.default[:foo] = "default"