[CHEF-3497] optionally store default values separately

This will make it easier for knife to apply config settings in the
proper order (default < config file < command line). It's not possible
to do without this patch because knife must parse command line options
to determine which config file to use.

1 files changed, 22 insertions, 1 deletions

diff --git a/spec/mixlib/cli_spec.rb b/spec/mixlib/cli_spec.rb
index 46ec1cf..39740b4 100644
--- a/spec/mixlib/cli_spec.rb
+++ b/spec/mixlib/cli_spec.rb
@@ -57,7 +57,7 @@ describe Mixlib::CLI do
     end
   end
 
-  describe "instance methods" do
+  context "when configured with default single-config-hash behavior" do
 
     before(:each) do
       @cli = TestCLI.new
@@ -214,6 +214,27 @@ describe Mixlib::CLI do
     end
   end
 
+  context "when configured to separate default options" do
+    before do
+      TestCLI.use_separate_default_options true
+      TestCLI.option(:defaulter, :short => "-D SOMETHING", :default => "this is the default")
+      @cli = TestCLI.new
+    end
+
+    it "sets default values on the `default` hash" do
+      @cli.parse_options([])
+      @cli.default_config[:defaulter].should == "this is the default"
+      @cli.config[:defaulter].should be_nil
+    end
+
+    it "sets parsed values on the `config` hash" do
+      @cli.parse_options(%w[-D not-default])
+      @cli.default_config[:defaulter].should == "this is the default"
+      @cli.config[:defaulter].should == "not-default"
+    end
+
+  end
+
 end