From 303567e554de26822f3107be55c471d6477a745f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 12 Feb 2015 12:04:23 -0800
Subject: [PATCH] lazily create the integration session

now we don't have to call reset! everywhere
---
 .../lib/action_dispatch/testing/integration.rb       | 12 +++++-------
 actionpack/test/dispatch/response_test.rb            |  4 ----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index f6b6c57a83..79aadaad53 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -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
 
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index c61423dce4..5fbd19acdf 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -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|
-- 
GitLab