diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-09-26 21:59:28 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-09-26 21:59:28 -0500 |
| commit | a6757a02e12aa584bd74dbcde18a7886be8e9029 (patch) | |
| tree | 74d3ca8fe45d1bc031371e7735241fa265e42c67 /actionpack/lib/action_dispatch/testing/integration.rb | |
| parent | 14866fa3d83676d340d94464f50e2e0ea989c3c1 (diff) | |
| download | rails-a6757a02e12aa584bd74dbcde18a7886be8e9029.tar.gz rails-a6757a02e12aa584bd74dbcde18a7886be8e9029.tar.bz2 rails-a6757a02e12aa584bd74dbcde18a7886be8e9029.zip | |
Move middleware and route configuration from AC::Dispatcher to Rails application object
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index f5dcea9158..9f7877fa46 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -484,8 +484,9 @@ module ActionDispatch @@app = nil def self.app - # DEPRECATE AC::Dispatcher fallback - @@app || ActionController::Dispatcher.new + # DEPRECATE Rails application fallback + # This should be set by the initializer + @@app || (defined?(Rails.application) && Rails.application) || nil end def self.app=(app) |