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

Revert "Revert integration test refactoring that caused app test regressions"

Browse source 
This reverts commit 7142059883.
This commit is contained in:
eileencodes 2015-03-09 17:10:24 -04:00
parent 094ad22349
commit d5e55e960c
2 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -388,8 +388,16 @@ module ActionDispatch
APP_SESSIONS = {} APP_SESSIONS = {}
def app attr_reader :app
@app ||= nil
def before_setup
super
@app = nil
@integration_session = nil
end
def integration_session
@integration_session ||= create_session(app)
end end
# Reset the current session. This is useful for testing multiple sessions # Reset the current session. This is useful for testing multiple sessions
@ -417,8 +425,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
@ -450,19 +456,16 @@ module ActionDispatch
# Copy the instance variables from the current session instance into the # Copy the instance variables from the current session instance into the
# test instance. # test instance.
def copy_session_variables! #:nodoc: def copy_session_variables! #:nodoc:
return unless integration_session
@controller = @integration_session.controller @controller = @integration_session.controller
@response = @integration_session.response @response = @integration_session.response
@request = @integration_session.request @request = @integration_session.request
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
@ -472,7 +475,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!
@ -481,11 +483,6 @@ module ActionDispatch
super super
end end
end end
private
def integration_session
@integration_session ||= nil
end
end end
end end
@ -663,7 +660,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|