Merge pull request #633 from Foodcritic/fc088

Don't detect Chef::Mixin::ShellOut as being Chef::ShellOut
Foodcritic · May 19, 2017 · d7d0ee7 · d7d0ee7
2 parents 8c492a7 + b9214db
commit d7d0ee7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/foodcritic/rules/fc089.rb b/lib/foodcritic/rules/fc089.rb
@@ -2,7 +2,7 @@
   tags %w{chef13 deprecated}
 
   def old_shellout(ast)
-    ast.xpath('//const[@value="ShellOut"]/..//const[@value="Chef"]')
+    ast.xpath('//const_path_ref[var_ref/const[@value="Chef"]]/const[@value="ShellOut"]')
   end
 
   resource { |ast| old_shellout(ast) }

diff --git a/spec/functional/fc089_spec.rb b/spec/functional/fc089_spec.rb
@@ -15,4 +15,9 @@
     resource_file "include Mixlib::Shellout"
     it { is_expected.not_to violate_rule }
   end
+
+  context "with a cookbook with a resource that uses Chef::Mixin::ShellOut" do
+    resource_file "include Chef::Mixin::ShellOut"
+    it { is_expected.not_to violate_rule }
+  end
 end