Only deactivate fake execution if we have already been activated

josephwilk · Aug 29, 2012 · 448093f · 448093f
1 parent 426af77
commit 448093f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/lib/fake_execution/base.rb b/lib/fake_execution/base.rb
@@ -15,14 +15,17 @@ def self.activate!
 
   def self.deactivate!
     Kernel.class_eval do
-      alias_method :fake_backtick, :`
-      alias_method :`, :real_backtick
+      # Have we been activated?
+      if method_defined?(:real_backtick)
+        alias_method :fake_backtick, :`
+        alias_method :`, :real_backtick
 
-      alias_method :fake_system, :system
-      alias_method :system, :real_system
+        alias_method :fake_system, :system
+        alias_method :system, :real_system
 
-      alias_method :fake_exec, :exec
-      alias_method :exec, :real_exec
+        alias_method :fake_exec, :exec
+        alias_method :exec, :real_exec
+      end
     end    
     true
   end

diff --git a/spec/fake_execution/spec_helpers_spec.rb b/spec/fake_execution/spec_helpers_spec.rb
@@ -1,5 +1,6 @@
+require 'fake_execution/spec_helpers'
+
 describe "require fake_execution/spec_helpers" do
-  require 'fake_execution/spec_helpers'
   include FakeExecution::SpecHelpers
 
   before(:each) do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -3,5 +3,5 @@
 require 'fake_execution/spec_helpers'
 
 RSpec.configure do |config|
-  config.extend(FakeExecution::SpecHelpers)
+  config.include FakeExecution::SpecHelpers
 end