diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/dummy/app/controllers/application_controller.rb | 2 | ||||
| -rw-r--r-- | test/test_helper.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/test/dummy/app/controllers/application_controller.rb b/test/dummy/app/controllers/application_controller.rb index e8065d9..be7aa1f 100644 --- a/test/dummy/app/controllers/application_controller.rb +++ b/test/dummy/app/controllers/application_controller.rb @@ -1,3 +1,5 @@ class ApplicationController < ActionController::Base protect_from_forgery + + ActiveSupport.run_load_hooks(:application_controller, self) end diff --git a/test/test_helper.rb b/test/test_helper.rb index f7d48ec..0016771 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,7 +2,10 @@ 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 } class ActiveSupport::TestCase # Add more helper methods to be used by all tests here... |