diff options
| author | wycats <wycats@gmail.com> | 2011-05-22 23:13:44 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2011-05-22 23:13:44 -0700 |
| commit | ddc584e89eaf6845f8cd72bcafce5035c9893dbb (patch) | |
| tree | 87d323e45b2eae1575887a14ca4c15d288d1869e /actionpack/lib/action_controller.rb | |
| parent | 0afefa95049766836e32e6a76873423d8640ebe3 (diff) | |
| download | rails-ddc584e89eaf6845f8cd72bcafce5035c9893dbb.tar.gz rails-ddc584e89eaf6845f8cd72bcafce5035c9893dbb.tar.bz2 rails-ddc584e89eaf6845f8cd72bcafce5035c9893dbb.zip | |
Restructure TemplateAssertions-related code to eliminate circular requires.
Also, no need to include dependencies in AS::Concerns inside included blocks.
Diffstat (limited to 'actionpack/lib/action_controller.rb')
| -rw-r--r-- | actionpack/lib/action_controller.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index eba5e9377b..f13fd71050 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -37,12 +37,13 @@ module ActionController autoload :UrlFor end - autoload :Integration, 'action_controller/deprecated/integration_test' - autoload :IntegrationTest, 'action_controller/deprecated/integration_test' - autoload :PerformanceTest, 'action_controller/deprecated/performance_test' - autoload :UrlWriter, 'action_controller/deprecated' - autoload :Routing, 'action_controller/deprecated' - autoload :TestCase, 'action_controller/test_case' + autoload :Integration, 'action_controller/deprecated/integration_test' + autoload :IntegrationTest, 'action_controller/deprecated/integration_test' + autoload :PerformanceTest, 'action_controller/deprecated/performance_test' + autoload :UrlWriter, 'action_controller/deprecated' + autoload :Routing, 'action_controller/deprecated' + autoload :TestCase, 'action_controller/test_case' + autoload :TemplateAssertions, 'action_controller/test_case' eager_autoload do autoload :RecordIdentifier |