summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-08-28 16:07:10 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2016-01-07 11:24:28 -0800
commit079205de05884e0f86c5fb9d59faa2b8f6d6f179 (patch)
tree25da0775534dfb12a7ae57ce23d0e624bcf7e88c
parent8e107efe9b6c36a66968ed5f4c5685beb210b095 (diff)
downloadchef-079205de05884e0f86c5fb9d59faa2b8f6d6f179.tar.gz
fix rebase merge mistake
-rw-r--r--spec/unit/provider/template/content_spec.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/unit/provider/template/content_spec.rb b/spec/unit/provider/template/content_spec.rb
index 89a88928a3..bcc68ba53d 100644
--- a/spec/unit/provider/template/content_spec.rb
+++ b/spec/unit/provider/template/content_spec.rb
@@ -164,6 +164,7 @@ helpers.erb
#{CHEF_SPEC_DATA}/cookbooks/openldap/templates/default/helpers.erb
EOF
end
+ end
it "node subtrees sent into the variables argument renders correctly" do
allow(new_resource).to receive(:source).and_return("render_test.conf.erb")