From 420004e030e96f2ace6e27fd622c90ee9e986677 Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Wed, 30 Sep 2009 12:39:26 -0700 Subject: 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. --- actionpack/lib/action_dispatch/testing/integration.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib') 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) -- cgit v1.2.3