Avoid conflicts w/ rspec's ARGV in tests

2 files changed, 12 insertions, 0 deletions

diff --git a/spec/unit/application/client_spec.rb b/spec/unit/application/client_spec.rb
index e894b8f702..45893119e2 100644
--- a/spec/unit/application/client_spec.rb
+++ b/spec/unit/application/client_spec.rb
@@ -19,6 +19,8 @@ require 'spec_helper'
 
 describe Chef::Application::Client, "reconfigure" do
   before do
+    @original_argv = ARGV.dup
+    ARGV.clear
     @original_config = Chef::Config.configuration.dup
 
     @app = Chef::Application::Client.new
@@ -34,6 +36,7 @@ describe Chef::Application::Client, "reconfigure" do
 
   after do
     Chef::Config.configuration.replace(@original_config)
+    ARGV.replace(@original_argv)
   end
 
   describe "when in daemonized mode and no interval has been set" do
@@ -137,10 +140,16 @@ end
 
 describe Chef::Application::Client, "configure_chef" do
   before do
+    @original_argv = ARGV.dup
+    ARGV.clear
     @app = Chef::Application::Client.new
     @app.configure_chef
   end
 
+  after do
+    ARGV.replace(@original_argv)
+  end
+
   it "should set the colored output to false by default on windows and true otherwise" do
     if windows?
       Chef::Config[:color].should be_false
diff --git a/spec/unit/application_spec.rb b/spec/unit/application_spec.rb
index f3df8c14cd..e0701614a3 100644
--- a/spec/unit/application_spec.rb
+++ b/spec/unit/application_spec.rb
@@ -20,6 +20,8 @@ require 'spec_helper'
 
 describe Chef::Application do
   before do
+    @original_argv = ARGV.dup
+    ARGV.clear
     @original_conf = Chef::Config.configuration
     Chef::Log.logger = Logger.new(StringIO.new)
     @app = Chef::Application.new
@@ -29,6 +31,7 @@ describe Chef::Application do
 
   after do
     Chef::Config.configuration.replace(@original_conf)
+    ARGV.replace(@original_argv)
   end
 
   describe "reconfigure" do