diff options
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/action_controller.rb | 10 | ||||
-rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 5f87429aca..678938af86 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -53,6 +53,7 @@ module ActionController autoload :Flash, 'action_controller/flash' autoload :Helpers, 'action_controller/helpers' autoload :HttpAuthentication, 'action_controller/http_authentication' + autoload :Integration, 'action_controller/integration' autoload :IntegrationTest, 'action_controller/integration' autoload :Layout, 'action_controller/layout' autoload :MimeResponds, 'action_controller/mime_responds' @@ -74,6 +75,15 @@ module ActionController autoload :UrlWriter, 'action_controller/url_rewriter' autoload :Verification, 'action_controller/verification' + module Assertions + autoload :DomAssertions, 'action_controller/assertions/dom_assertions' + autoload :ModelAssertions, 'action_controller/assertions/model_assertions' + autoload :ResponseAssertions, 'action_controller/assertions/response_assertions' + autoload :RoutingAssertions, 'action_controller/assertions/routing_assertions' + autoload :SelectorAssertions, 'action_controller/assertions/selector_assertions' + autoload :TagAssertions, 'action_controller/assertions/tag_assertions' + end + module Http autoload :Headers, 'action_controller/headers' end diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index b925230118..79a8e1364d 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -107,7 +107,6 @@ module ActionController class TestCase < ActiveSupport::TestCase module Assertions %w(response selector tag dom routing model).each do |kind| - require "action_controller/assertions/#{kind}_assertions" include ActionController::Assertions.const_get("#{kind.camelize}Assertions") end |