feature #2276 Single Executable: optparser should get CommandLine#args instead of ARGV

Signed-off-by: Jesse Wolfe <jes5199@gmail.com>

2 files changed, 5 insertions, 17 deletions

diff --git a/spec/unit/application/agent.rb b/spec/unit/application/agent.rb
index fbcc61be3..2439feae2 100755
--- a/spec/unit/application/agent.rb
+++ b/spec/unit/application/agent.rb
@@ -92,13 +92,7 @@ describe Puppet::Application::Agent do
 
     describe "when handling options" do
         before do
-            @old_argv = ARGV.dup
-            ARGV.clear
-        end
-
-        after do
-            ARGV.clear
-            @old_argv.each { |a| ARGV << a }
+            @puppetd.command_line.stubs(:args).returns([])
         end
 
         [:centrallogging, :disable, :enable, :debug, :fqdn, :test, :verbose, :digest].each do |option|
@@ -154,8 +148,8 @@ describe Puppet::Application::Agent do
             @puppetd.handle_logdest("console")
         end
 
-        it "should parse the log destination from ARGV" do
-            ARGV << "--logdest" << "/my/file"
+        it "should parse the log destination from the command line" do
+            @puppetd.command_line.stubs(:args).returns(%w[--logdest /my/file])
 
             Puppet::Util::Log.expects(:newdestination).with("/my/file")
 
diff --git a/spec/unit/application/master.rb b/spec/unit/application/master.rb
index 2672fdb16..362769e53 100644
--- a/spec/unit/application/master.rb
+++ b/spec/unit/application/master.rb
@@ -80,13 +80,7 @@ describe Puppet::Application::Master do
 
     describe "when applying options" do
         before do
-            @old_argv = ARGV.dup
-            ARGV.clear
-        end
-
-        after do
-            ARGV.clear
-            @old_argv.each { |a| ARGV << a }
+            @master.command_line.stubs(:args).returns([])
         end
 
         it "should set the log destination with --logdest" do
@@ -102,7 +96,7 @@ describe Puppet::Application::Master do
         end
 
         it "should parse the log destination from ARGV" do
-            ARGV << "--logdest" << "/my/file"
+            @master.command_line.stubs(:args).returns(%w[--logdest /my/file])
 
             Puppet::Util::Log.expects(:newdestination).with("/my/file")