diff options
| author | Carl Lerche <carllerche@mac.com> | 2009-09-30 12:39:26 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-09-30 12:39:26 -0700 |
| commit | 420004e030e96f2ace6e27fd622c90ee9e986677 (patch) | |
| tree | 9bb4990fff1934dd5226ba29810fc4bad90a3646 /actionpack/lib/action_dispatch | |
| parent | 2370e87ae0babf0fb4b21254c8120f7a93189d40 (diff) | |
| download | rails-420004e030e96f2ace6e27fd622c90ee9e986677.tar.gz rails-420004e030e96f2ace6e27fd622c90ee9e986677.tar.bz2 rails-420004e030e96f2ace6e27fd622c90ee9e986677.zip | |
Initialize a new instance of Rails.application during integration tests
This is to fix the AWDWR tests until the application object is refactored to be a singleton.
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 9f7877fa46..2c4a3a356d 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -486,7 +486,7 @@ module ActionDispatch def self.app # DEPRECATE Rails application fallback # This should be set by the initializer - @@app || (defined?(Rails.application) && Rails.application) || nil + @@app || (defined?(Rails.application) && Rails.application.new) || nil end def self.app=(app) |