summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-11-19 14:46:40 +0100
committerAzul <azul@leap.se>2012-11-19 14:46:40 +0100
commit9810d5b66ca7f81df402e9b05957466a947bdf9b (patch)
tree9602e8b1dfd7e63a6d77121cf7e7d576c516f031 /test
parentac4b60d13162c46ec72112f0ef3d315734868d1e (diff)
use latest mocha version without monkey patching :)
Diffstat (limited to 'test')
-rw-r--r--test/test_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 50d5159..0016771 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,7 +2,7 @@ ENV["RAILS_ENV"] = "test"
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
-require 'mocha'
+require 'mocha/setup'
# Load support files from all engines
Dir["#{File.dirname(__FILE__)}/../*/test/support/**/*.rb"].each { |f| require f }