(#6749) Extract the action from the arguments cleanly.

This adds a test to verify that we are correctly removing the action name from
the set of arguments passed to the string action, then cleans up the previous
code so we don't need to mutilate the command line arguments: we can just
extract it from the resultant set of information.

Reviewed-By: Nick Lewis <nick@puppetlabs.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/unit/application/string_base_spec.rb b/spec/unit/application/string_base_spec.rb
index 7f06c05f4..5cfb8352a 100755
--- a/spec/unit/application/string_base_spec.rb
+++ b/spec/unit/application/string_base_spec.rb
@@ -115,6 +115,14 @@ describe Puppet::Application::StringBase do
     end
   end
 
+  describe "#setup" do
+    it "should remove the action name from the arguments" do
+      app.command_line.stubs(:args).returns %w{--mandatory --bar foo}
+      app.preinit and app.parse_options and app.setup
+      app.arguments.should == [{ :mandatory => "--bar" }]
+    end
+  end
+
   describe "#main" do
     before do
       app.string    = Puppet::String[:basetest, '0.0.1']