summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2012-11-20 11:58:09 -0800
committerjessib <jessib@leap.se>2012-11-20 11:58:09 -0800
commit80cd2489d87a523663d92776de55fa7fda2ecb99 (patch)
tree44e27ecffb66bc590de67a187954ba8ac96a9ede /test
parent9289ae6601cacb746f83f9bd9d953d0591eac0da (diff)
parentcd743d686ade50a9b23965a99c57b8105e834ec9 (diff)
Merge branch 'develop' into help_develop
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 }