diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-05-28 11:35:36 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-05-28 11:35:36 -0500 |
| commit | 4e50a35fa243f6cf7ad567774a9f7c1cb87a1653 (patch) | |
| tree | 6bfb95c899c61b10406a03f8e9a6211b93fecd6b /actionpack/lib/action_controller/testing | |
| parent | de203245afd2bbf7f93f3241fcf3a71a88101d47 (diff) | |
| download | rails-4e50a35fa243f6cf7ad567774a9f7c1cb87a1653.tar.gz rails-4e50a35fa243f6cf7ad567774a9f7c1cb87a1653.tar.bz2 rails-4e50a35fa243f6cf7ad567774a9f7c1cb87a1653.zip | |
Break up DependencyModule's dual function of providing a "depend_on" DSL and "included" block DSL into separate modules. But, unify both approaches under AS::Concern.
Diffstat (limited to 'actionpack/lib/action_controller/testing')
| -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 |