summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--spec/data/cookbooks/preseed/files/default/preseed-template.seed4
-rw-r--r--spec/functional/resource/package_spec.rb4
2 files changed, 8 insertions, 0 deletions
diff --git a/spec/data/cookbooks/preseed/files/default/preseed-template.seed b/spec/data/cookbooks/preseed/files/default/preseed-template.seed
new file mode 100644
index 0000000000..011bc40f1b
--- /dev/null
+++ b/spec/data/cookbooks/preseed/files/default/preseed-template.seed
@@ -0,0 +1,4 @@
+# This file should never be executed by the preseeding tests
+# This is here to verify that templates are preferred over cookbook_files when
+# preseeding packages.
+chef-integration-test chef-integration-test/sample-var string "WRONG-cookbook file used instead of template!"
diff --git a/spec/functional/resource/package_spec.rb b/spec/functional/resource/package_spec.rb
index 3861703199..c11ff2038d 100644
--- a/spec/functional/resource/package_spec.rb
+++ b/spec/functional/resource/package_spec.rb
@@ -262,6 +262,10 @@ describe Chef::Resource::Package, metadata do
context "with a preseed template" do
+ # NOTE: in the fixtures, there is also a cookbook_file named
+ # "preseed-template.seed". This implicitly tests that templates are
+ # preferred over cookbook_files when both are present.
+
let(:package_resource) do
r = base_resource
r.cookbook_name = "preseed"