summaryrefslogtreecommitdiff
path: root/test/test_helper.rb
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-11-19 14:47:19 +0100
committerAzul <azul@leap.se>2012-11-19 14:47:19 +0100
commitc8cf2f5911f09d6898cff7d6a79f139272b065e7 (patch)
tree9602e8b1dfd7e63a6d77121cf7e7d576c516f031 /test/test_helper.rb
parent5a5e73f2fefa8e1a06f18063a6d644a6d1c2a869 (diff)
parent9810d5b66ca7f81df402e9b05957466a947bdf9b (diff)
Merge branch 'feature-require_login_for_cert_download' into develop
Diffstat (limited to 'test/test_helper.rb')
-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 }