提交 c1261b54 编写于 作者: J Joshua Peek

Use Rails.application where we want a valid rack app

上级 d8594026
......@@ -50,7 +50,7 @@ def define_dispatcher_callbacks(cache_classes)
def new
# DEPRECATE Rails application fallback
Rails.application.new
Rails.application
end
end
end
......
......@@ -490,7 +490,7 @@ class IntegrationTest < ActiveSupport::TestCase
def self.app
# DEPRECATE Rails application fallback
# This should be set by the initializer
@@app || (defined?(Rails.application) && Rails.application.new) || nil
@@app || (defined?(Rails.application) && Rails.application) || nil
end
def self.app=(app)
......
......@@ -2,4 +2,4 @@
require ::File.expand_path('../config/environment', __FILE__)
# Dispatch the request
run Rails.application.new
run Rails.application
......@@ -40,7 +40,7 @@ def setup
test "Rails.application is available after config.ru has been racked up" do
rackup
assert Rails.application.new < Rails::Application
assert Rails.application < Rails::Application
end
# Passenger still uses AC::Dispatcher, so we need to
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册