Merge pull request #2368 from opscode/sersut/knife-cloud-bootstrap-options

Knife cloud plugins bootstrap problem with Chef 12 when using custom templates.

1 files changed, 27 insertions, 1 deletions

diff --git a/spec/unit/knife/bootstrap_spec.rb b/spec/unit/knife/bootstrap_spec.rb
index 2599e44a56..9769be5b8a 100644
--- a/spec/unit/knife/bootstrap_spec.rb
+++ b/spec/unit/knife/bootstrap_spec.rb
@@ -29,7 +29,7 @@ describe Chef::Knife::Bootstrap do
     Chef::Log.logger = Logger.new(StringIO.new)
     Chef::Config[:knife][:bootstrap_template] = bootstrap_template unless bootstrap_template.nil?
 
-    k = Chef::Knife::Bootstrap.new
+    k = Chef::Knife::Bootstrap.new(bootstrap_cli_options)
     k.merge_configs
 
     k.ui.stub(:stderr).and_return(stderr)
@@ -41,11 +41,37 @@ describe Chef::Knife::Bootstrap do
 
   let(:bootstrap_template) { nil }
 
+  let(:bootstrap_cli_options) { [ ] }
+
   it "should use chef-full as default template" do
     knife.bootstrap_template.should be_a_kind_of(String)
     File.basename(knife.bootstrap_template).should eq("chef-full")
   end
 
+  context "with :distro and :bootstrap_template cli options" do
+    let(:bootstrap_cli_options) { [ "--bootstrap-template", "my-template", "--distro", "other-template" ] }
+
+    it "should select bootstrap template" do
+      expect(File.basename(knife.bootstrap_template)).to eq("my-template")
+    end
+  end
+
+  context "with :distro and :template_file cli options" do
+    let(:bootstrap_cli_options) { [ "--distro", "my-template", "--template-file", "other-template" ] }
+
+    it "should select bootstrap template" do
+      expect(File.basename(knife.bootstrap_template)).to eq("other-template")
+    end
+  end
+
+  context "with :bootstrap_template and :template_file cli options" do
+    let(:bootstrap_cli_options) { [ "--bootstrap-template", "my-template", "--template-file", "other-template" ] }
+
+    it "should select bootstrap template" do
+      expect(File.basename(knife.bootstrap_template)).to eq("my-template")
+    end
+  end
+
   context "when finding templates" do
     context "when :bootstrap_template config is set to a file" do
       context "that doesn't exist" do