kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

lazily create the integration session

Browse source 
now we don't have to call reset! everywhere
This commit is contained in:
Aaron Patterson 2015-02-12 12:04:23 -08:00
parent fa63448420
commit 303567e554
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
actionpack/lib/action_dispatch/testing/integration.rb
View file

@ -389,7 +389,7 @@ module ActionDispatch
APP_SESSIONS = {} APP_SESSIONS = {}
attr_reader :app, :integration_session attr_reader :app
def before_setup def before_setup
super super
@ -397,6 +397,10 @@ module ActionDispatch
@integration_session = nil @integration_session = nil
end end
def integration_session
@integration_session ||= create_session(app)
end
# Reset the current session. This is useful for testing multiple sessions # Reset the current session. This is useful for testing multiple sessions
# in a single test case. # in a single test case.
def reset! def reset!
@ -422,8 +426,6 @@ module ActionDispatch
%w(get post patch put head delete cookies assigns %w(get post patch put head delete cookies assigns
xml_http_request xhr get_via_redirect post_via_redirect).each do |method| xml_http_request xhr get_via_redirect post_via_redirect).each do |method|
define_method(method) do |*args| define_method(method) do |*args|
reset! unless integration_session
# reset the html_document variable, except for cookies/assigns calls # reset the html_document variable, except for cookies/assigns calls
unless method == 'cookies' || method == 'assigns' unless method == 'cookies' || method == 'assigns'
@html_document = nil @html_document = nil
@ -462,12 +464,10 @@ module ActionDispatch
end end
def default_url_options def default_url_options
reset! unless integration_session
integration_session.default_url_options integration_session.default_url_options
end end
def default_url_options=(options) def default_url_options=(options)
reset! unless integration_session
integration_session.default_url_options = options integration_session.default_url_options = options
end end
@ -477,7 +477,6 @@ module ActionDispatch
# Delegate unhandled messages to the current session instance. # Delegate unhandled messages to the current session instance.
def method_missing(sym, *args, &block) def method_missing(sym, *args, &block)
reset! unless integration_session
if integration_session.respond_to?(sym) if integration_session.respond_to?(sym)
integration_session.__send__(sym, *args, &block).tap do integration_session.__send__(sym, *args, &block).tap do
copy_session_variables! copy_session_variables!
@ -662,7 +661,6 @@ module ActionDispatch
end end
def url_options def url_options
reset! unless integration_session
integration_session.url_options integration_session.url_options
end end

4
actionpack/test/dispatch/response_test.rb
View file

@ -254,10 +254,6 @@ class ResponseTest < ActiveSupport::TestCase
end end
class ResponseIntegrationTest < ActionDispatch::IntegrationTest class ResponseIntegrationTest < ActionDispatch::IntegrationTest
def app
@app
end
test "response cache control from railsish app" do test "response cache control from railsish app" do
@app = lambda { |env| @app = lambda { |env|
ActionDispatch::Response.new.tap { |resp| ActionDispatch::Response.new.tap { |resp|