ripping out rspec_reset entirely

5 files changed, 0 insertions, 16 deletions

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3bae699cae..5098a1fb85 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -86,16 +86,6 @@ Dir["spec/support/**/*.rb"].
   map { |f| f.gsub(%r[spec/], '')}.
   each { |f| require f }
 
-module VerifyAndResetHelpers
-  def verify(object)
-    RSpec::Mocks.proxy_for(object).verify
-  end
-
-  def reset(object)
-    RSpec::Mocks.proxy_for(object).reset
-  end
-end
-
 OHAI_SYSTEM = Ohai::System.new
 OHAI_SYSTEM.require_plugin("os")
 OHAI_SYSTEM.require_plugin("platform")
@@ -159,8 +149,6 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
 
-  config.include VerifyAndResetHelpers
-
   config.before(:each) do
     Chef::Config.reset
   end
diff --git a/spec/unit/daemon_spec.rb b/spec/unit/daemon_spec.rb
index ea6bc95df8..9132dae389 100644
--- a/spec/unit/daemon_spec.rb
+++ b/spec/unit/daemon_spec.rb
@@ -79,7 +79,6 @@ describe Chef::Daemon do
     end
 
     it "changes the working directory to root" do
-      reset Dir
       Dir.should_receive(:chdir).with("/").and_return(0)
       Chef::Daemon.change_privilege
     end
diff --git a/spec/unit/provider/deploy/revision_spec.rb b/spec/unit/provider/deploy/revision_spec.rb
index 292c0ad9f6..8d4590378e 100644
--- a/spec/unit/provider/deploy/revision_spec.rb
+++ b/spec/unit/provider/deploy/revision_spec.rb
@@ -37,7 +37,6 @@ describe Chef::Provider::Deploy::Revision do
 
   after do
     # Make sure we don't keep any state in our tests
-    reset FileUtils
     FileUtils.rm_rf @temp_dir if File.directory?( @temp_dir )
   end
 
diff --git a/spec/unit/provider/mount/mount_spec.rb b/spec/unit/provider/mount/mount_spec.rb
index b1339eef8a..99e78590f1 100644
--- a/spec/unit/provider/mount/mount_spec.rb
+++ b/spec/unit/provider/mount/mount_spec.rb
@@ -263,7 +263,6 @@ describe Chef::Provider::Mount::Mount do
 
     describe "mount_fs" do
       it "should mount the filesystem if it is not mounted" do
-        reset @provider
         @provider.should_receive(:shell_out!).with("mount -t ext3 -o defaults /dev/sdz1 /tmp/foo")
         @provider.mount_fs()
       end
diff --git a/spec/unit/shell_spec.rb b/spec/unit/shell_spec.rb
index 6f155c46ad..cce743873f 100644
--- a/spec/unit/shell_spec.rb
+++ b/spec/unit/shell_spec.rb
@@ -42,7 +42,6 @@ describe Shell do
 
   before do
     Shell.irb_conf = {}
-    reset Shell::ShellSession.instance
     Shell::ShellSession.instance.stub(:reset!)
   end