summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYulian Kuncheff <yulian@kuncheff.com>2014-11-17 16:16:40 -0800
committerYulian Kuncheff <yulian@kuncheff.com>2014-11-24 09:55:11 -0800
commit659b4101d2ab1a227b5da34bd285a4c449e01eb7 (patch)
tree0bcf7a88a781359040a83b49690f1af544e380f1
parent8c4e32c4e8ac22394222c718e61b13e3d5ec2ad3 (diff)
downloadchef-659b4101d2ab1a227b5da34bd285a4c449e01eb7.tar.gz
Fix installer_version_string to be an array on prerelease parameter.
-rw-r--r--lib/chef/knife/core/bootstrap_context.rb2
-rw-r--r--spec/unit/knife/core/bootstrap_context_spec.rb14
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/chef/knife/core/bootstrap_context.rb b/lib/chef/knife/core/bootstrap_context.rb
index e681d7a49b..ce062bdd25 100644
--- a/lib/chef/knife/core/bootstrap_context.rb
+++ b/lib/chef/knife/core/bootstrap_context.rb
@@ -135,7 +135,7 @@ CONFIG
def latest_current_chef_version_string
installer_version_string = nil
if @config[:prerelease]
- installer_version_string = "-p"
+ installer_version_string = ["-p"]
else
chef_version_string = if knife_config[:bootstrap_version]
knife_config[:bootstrap_version]
diff --git a/spec/unit/knife/core/bootstrap_context_spec.rb b/spec/unit/knife/core/bootstrap_context_spec.rb
index 1291571358..af8fa3f698 100644
--- a/spec/unit/knife/core/bootstrap_context_spec.rb
+++ b/spec/unit/knife/core/bootstrap_context_spec.rb
@@ -205,4 +205,18 @@ EXPECTED
end
end
+ describe "prerelease" do
+ it "isn't set in the config_content by default" do
+ expect(bootstrap_context.config_content).not_to include("prerelease")
+ end
+
+ describe "when configured via cli" do
+ let(:config) {{:prerelease => true}}
+
+ it "uses CLI value" do
+ expect(bootstrap_context.latest_current_chef_version_string).to eq("-p")
+ end
+ end
+ end
+
end