提交 303567e5 编写于 作者: A Aaron Patterson

lazily create the integration session

now we don't have to call reset! everywhere
上级 fa634484
......@@ -389,7 +389,7 @@ module Runner
APP_SESSIONS = {}
attr_reader :app, :integration_session
attr_reader :app
def before_setup
super
......@@ -397,6 +397,10 @@ def before_setup
@integration_session = nil
end
def integration_session
@integration_session ||= create_session(app)
end
# Reset the current session. This is useful for testing multiple sessions
# in a single test case.
def reset!
......@@ -422,8 +426,6 @@ def remove! # :nodoc:
%w(get post patch put head delete cookies assigns
xml_http_request xhr get_via_redirect post_via_redirect).each do |method|
define_method(method) do |*args|
reset! unless integration_session
# reset the html_document variable, except for cookies/assigns calls
unless method == 'cookies' || method == 'assigns'
@html_document = nil
......@@ -462,12 +464,10 @@ def copy_session_variables! #:nodoc:
end
def default_url_options
reset! unless integration_session
integration_session.default_url_options
end
def default_url_options=(options)
reset! unless integration_session
integration_session.default_url_options = options
end
......@@ -477,7 +477,6 @@ def respond_to?(method, include_private = false)
# Delegate unhandled messages to the current session instance.
def method_missing(sym, *args, &block)
reset! unless integration_session
if integration_session.respond_to?(sym)
integration_session.__send__(sym, *args, &block).tap do
copy_session_variables!
......@@ -662,7 +661,6 @@ def app
end
def url_options
reset! unless integration_session
integration_session.url_options
end
......
......@@ -254,10 +254,6 @@ def test_response_body_encoding
end
class ResponseIntegrationTest < ActionDispatch::IntegrationTest
def app
@app
end
test "response cache control from railsish app" do
@app = lambda { |env|
ActionDispatch::Response.new.tap { |resp|
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册