diff options
| author | Azul <azul@leap.se> | 2012-12-07 08:28:23 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-07 08:28:23 +0100 |
| commit | 1ec55c4f562a4fdd57c50077ff286ef08e9978a1 (patch) | |
| tree | 16203d2ca4f32e24d38fef6062aa9534cecb3bfe /users/test/test_helper.rb | |
| parent | effa6b0f84cfe954cc9dd73f592663b743b0d857 (diff) | |
| parent | a3dce077881c7e97090e5e560b1fb004952d5b23 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'users/test/test_helper.rb')
| -rw-r--r-- | users/test/test_helper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/users/test/test_helper.rb b/users/test/test_helper.rb index 08d4d41..52dff53 100644 --- a/users/test/test_helper.rb +++ b/users/test/test_helper.rb @@ -1,10 +1,9 @@ ENV["RAILS_ENV"] = "test" require File.expand_path('../../../test/dummy/config/environment', __FILE__) require 'rails/test_help' -require 'mocha' +require 'mocha/setup' Rails.backtrace_cleaner.remove_silencers! # Load support files Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f } - |