Skip to content
Browse files

Merge pull request #85 from freerange/fix-mocha-deprecation-warning

Avoid deprecation warning in Mocha 0.13.0.
  • Loading branch information...
2 parents 91297fa + b3aa657 commit 4721dab5a79b53e4153ff753f9a565139d744d5d @blowmage committed Dec 1, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/minitest/rails/mochaing.rb
View
2 lib/minitest/rails/mochaing.rb
@@ -2,7 +2,7 @@
require 'active_support/testing/mochaing'
rescue LoadError
begin
- silence_warnings { require 'mocha' }
+ silence_warnings { require 'mocha/setup' }
rescue LoadError
# Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
Object.const_set :Mocha, Module.new

0 comments on commit 4721dab

Please sign in to comment.
Something went wrong with that request. Please try again.