diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-06-01 09:38:09 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-06-01 09:38:09 +0100 |
| commit | 9d60525b5fc14b4b6f3ed9ba8ea874d6e76b4f78 (patch) | |
| tree | 5a711cacac76a83ad12551023da8524f94e7365b /actionpack/lib/action_controller/testing/integration.rb | |
| parent | dc7323efd34327c13d26031b68e51314c24360f6 (diff) | |
| parent | 9537fd0e3a7625afe4bee75d749647ca1837195a (diff) | |
| download | rails-9d60525b5fc14b4b6f3ed9ba8ea874d6e76b4f78.tar.gz rails-9d60525b5fc14b4b6f3ed9ba8ea874d6e76b4f78.tar.bz2 rails-9d60525b5fc14b4b6f3ed9ba8ea874d6e76b4f78.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/testing/integration.rb')
| -rw-r--r-- | actionpack/lib/action_controller/testing/integration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/testing/integration.rb b/actionpack/lib/action_controller/testing/integration.rb index cc157816e2..af4ccb7837 100644 --- a/actionpack/lib/action_controller/testing/integration.rb +++ b/actionpack/lib/action_controller/testing/integration.rb @@ -301,7 +301,7 @@ module ActionController # A module used to extend ActionController::Base, so that integration tests # can capture the controller used to satisfy a request. module ControllerCapture #:nodoc: - extend ActiveSupport::DependencyModule + extend ActiveSupport::Concern included do alias_method_chain :initialize, :capture |