summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
Diffstat (limited to 'spec')
-rw-r--r--spec/data/cookbooks/openldap/recipes/default.rb1
-rw-r--r--spec/data/cookbooks/openldap/recipes/return.rb2
-rw-r--r--spec/unit/cookbook/syntax_check_spec.rb9
3 files changed, 8 insertions, 4 deletions
diff --git a/spec/data/cookbooks/openldap/recipes/default.rb b/spec/data/cookbooks/openldap/recipes/default.rb
index 0ac8a9bb4b..ba5c9d1507 100644
--- a/spec/data/cookbooks/openldap/recipes/default.rb
+++ b/spec/data/cookbooks/openldap/recipes/default.rb
@@ -1,3 +1,4 @@
+
cat "blanket" do
pretty_kitty true
end
diff --git a/spec/data/cookbooks/openldap/recipes/return.rb b/spec/data/cookbooks/openldap/recipes/return.rb
new file mode 100644
index 0000000000..79bfb5e441
--- /dev/null
+++ b/spec/data/cookbooks/openldap/recipes/return.rb
@@ -0,0 +1,2 @@
+# CHEF-5199 regression test.
+return nil
diff --git a/spec/unit/cookbook/syntax_check_spec.rb b/spec/unit/cookbook/syntax_check_spec.rb
index a674f6ab40..7f7a914115 100644
--- a/spec/unit/cookbook/syntax_check_spec.rb
+++ b/spec/unit/cookbook/syntax_check_spec.rb
@@ -24,7 +24,7 @@ describe Chef::Cookbook::SyntaxCheck do
let(:cookbook_path) { File.join(CHEF_SPEC_DATA, 'cookbooks', 'openldap') }
let(:syntax_check) { Chef::Cookbook::SyntaxCheck.new(cookbook_path) }
- let(:open_ldap_cookbook_files) {
+ let(:open_ldap_cookbook_files) do
%w{ attributes/default.rb
attributes/smokey.rb
definitions/client.rb
@@ -32,8 +32,9 @@ describe Chef::Cookbook::SyntaxCheck do
metadata.rb
recipes/default.rb
recipes/gigantor.rb
- recipes/one.rb }.map{ |f| File.join(cookbook_path, f) }
-}
+ recipes/one.rb
+ recipes/return.rb }.map{ |f| File.join(cookbook_path, f) }
+ end
before do
Chef::Log.logger = Logger.new(StringIO.new)
@@ -41,7 +42,7 @@ describe Chef::Cookbook::SyntaxCheck do
@attr_files = %w{default.rb smokey.rb}.map { |f| File.join(cookbook_path, 'attributes', f) }
@defn_files = %w{client.rb server.rb}.map { |f| File.join(cookbook_path, 'definitions', f)}
- @recipes = %w{default.rb gigantor.rb one.rb}.map { |f| File.join(cookbook_path, 'recipes', f) }
+ @recipes = %w{default.rb gigantor.rb one.rb return.rb}.map { |f| File.join(cookbook_path, 'recipes', f) }
@ruby_files = @attr_files + @defn_files + @recipes + [File.join(cookbook_path, "metadata.rb")]
basenames = %w{ helpers_via_partial_test.erb
helper_test.erb