summaryrefslogtreecommitdiff
path: root/test/test_helper.rb
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-11-04 17:57:03 +0100
committerAzul <azul@leap.se>2012-11-04 17:57:03 +0100
commitc0f92bf9f481463dcaef6f4b30343130a8910a00 (patch)
tree3ba89c6f38d19a7b96a0ef599b7cb6364ba5821f /test/test_helper.rb
parentb92d418ebec6486a9e728c57f38f82d4c3343341 (diff)
parent19008253d01fd6d7a864e98a7ae5dc216070aee1 (diff)
Merge branch 'develop' into feature-warden-srp
Conflicts: Gemfile.lock users/app/controllers/application_controller.rb users/leap_web_users.gemspec
Diffstat (limited to 'test/test_helper.rb')
-rw-r--r--test/test_helper.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/test_helper.rb b/test/test_helper.rb
index f7d48ec..50d5159 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -4,6 +4,9 @@ require 'rails/test_help'
require 'mocha'
+# Load support files from all engines
+Dir["#{File.dirname(__FILE__)}/../*/test/support/**/*.rb"].each { |f| require f }
+
class ActiveSupport::TestCase
# Add more helper methods to be used by all tests here...
end