diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-12-12 18:41:26 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-12-12 18:41:26 -0600 |
| commit | 018dafe574d370165547516ffef43394e11ab4da (patch) | |
| tree | 6ad2359b8f00dabee5e1fd46bebb59fc72530f36 /actionpack/lib/action_controller | |
| parent | ee395fe626760e897abd9e881b54d3cc3f407d31 (diff) | |
| download | rails-018dafe574d370165547516ffef43394e11ab4da.tar.gz rails-018dafe574d370165547516ffef43394e11ab4da.tar.bz2 rails-018dafe574d370165547516ffef43394e11ab4da.zip | |
Allow autoloads to opt out of eager loading
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/deprecated/integration_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/deprecated/integration_test.rb b/actionpack/lib/action_controller/deprecated/integration_test.rb index 05c8c0f156..86336b6bc4 100644 --- a/actionpack/lib/action_controller/deprecated/integration_test.rb +++ b/actionpack/lib/action_controller/deprecated/integration_test.rb @@ -1,4 +1,2 @@ -require "action_dispatch/testing/integration" - ActionController::Integration = ActionDispatch::Integration ActionController::IntegrationTest = ActionDispatch::IntegrationTest diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 14cd0dc7e0..398ea52495 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -1,7 +1,6 @@ require 'active_support/test_case' require 'rack/session/abstract/id' require 'action_controller/metal/testing' -require 'action_dispatch/test_case' module ActionController class TestRequest < ActionDispatch::TestRequest #:nodoc: |