lib/mocha/integration/monkey_patcher.rb in mocha-1.6.0 vs lib/mocha/integration/monkey_patcher.rb in mocha-1.7.0
- old
+ new
@@ -9,17 +9,15 @@
else
mod.send(:include, Mocha::API)
end
if mod.method_defined?(:run_before_mocha)
Debug.puts "#{mod}#run_before_mocha method already defined"
+ elsif mod.method_defined?(:run)
+ mod.send(:alias_method, :run_before_mocha, :run)
+ mod.send(:remove_method, :run)
+ mod.send(:include, run_method_patch)
else
- if mod.method_defined?(:run)
- mod.send(:alias_method, :run_before_mocha, :run)
- mod.send(:remove_method, :run)
- mod.send(:include, run_method_patch)
- else
- raise "Unable to monkey-patch #{mod}, because it does not define a `#run` method"
- end
+ raise "Unable to monkey-patch #{mod}, because it does not define a `#run` method"
end
end
end
end
end