diff options
| author | danielsdeleo <dan@opscode.com> | 2013-08-02 09:10:49 -0700 |
|---|---|---|
| committer | danielsdeleo <dan@opscode.com> | 2013-08-02 09:10:49 -0700 |
| commit | fd08a1044bc27c002ac6ebb012c333acd7e29ce7 (patch) | |
| tree | e3d5d9249232d758a52de200e3ce7d857aea44dd | |
| parent | d8790a911f6983cc3d53e3fcd2bdaee3f97c265e (diff) | |
| download | chef-CHEF-4406.tar.gz | |
Verify that templates are preferred to files for preseedingCHEF-4406
| -rw-r--r-- | spec/data/cookbooks/preseed/files/default/preseed-template.seed | 4 | ||||
| -rw-r--r-- | spec/functional/resource/package_spec.rb | 4 |
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" |