1 files changed, 31 insertions, 26 deletions

diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 2093bb3a0e..0aff4250c1 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -1,6 +1,6 @@
 require 'stringio'
 require 'uri'
-require 'active_support/core_ext/object/metaclass'
+require 'active_support/core_ext/object/singleton_class'
 require 'rack/test'
 
 module ActionDispatch
@@ -162,12 +162,31 @@ module ActionDispatch
       # A running counter of the number of requests processed.
       attr_accessor :request_count
 
+      include ActionDispatch::Routing::UrlFor
+
       # Create and initialize a new Session instance.
       def initialize(app)
         @app = app
+
+        # If the app is a Rails app, make url_helpers available on the session
+        # This makes app.url_for and app.foo_path available in the console
+        if app.respond_to?(:routes) && app.routes.respond_to?(:url_helpers)
+          singleton_class.class_eval { include app.routes.url_helpers }
+        end
+
         reset!
       end
 
+      def url_options
+        opts = super.reverse_merge(
+          :host => host,
+          :protocol => https? ? "https" : "http"
+        )
+
+        opts.merge!(:port => 443) if !opts.key?(:port) && https?
+        opts
+      end
+
       # Resets the instance. This can be used to reset the state information
       # in an existing session instance, so it can be used from a clean-slate
       # condition.
@@ -187,12 +206,10 @@ module ActionDispatch
 
         unless defined? @named_routes_configured
           # install the named routes in this session instance.
-          klass = metaclass
-          ActionController::Routing::Routes.install_helpers(klass)
+          klass = singleton_class
 
           # the helpers are made protected by default--we make them public for
           # easier access during testing and troubleshooting.
-          klass.module_eval { public *ActionController::Routing::Routes.named_routes.helpers }
           @named_routes_configured = true
         end
       end
@@ -221,14 +238,6 @@ module ActionDispatch
         @host = name
       end
 
-      # Returns the URL for the given options, according to the rules specified
-      # in the application's routes.
-      def url_for(options)
-        controller ?
-          controller.url_for(options) :
-          generic_url_rewriter.rewrite(options)
-      end
-
       private
 
         # Performs the actual request.
@@ -273,26 +282,14 @@ module ActionDispatch
 
           @request_count += 1
           @request  = ActionDispatch::Request.new(session.last_request.env)
-          @response = ActionDispatch::TestResponse.from_response(@mock_session.last_response)
+          response = @mock_session.last_response
+          @response = ActionDispatch::TestResponse.new(response.status, response.headers, response.body)
           @html_document = nil
 
           @controller = session.last_request.env['action_controller.instance']
 
           return response.status
         end
-
-        # Get a temporary URL writer object
-        def generic_url_rewriter
-          env = {
-            'REQUEST_METHOD' => "GET",
-            'QUERY_STRING'   => "",
-            "REQUEST_URI"    => "/",
-            "HTTP_HOST"      => host,
-            "SERVER_PORT"    => https? ? "443" : "80",
-            "HTTPS"          => https? ? "on" : "off"
-          }
-          ActionController::UrlRewriter.new(ActionDispatch::Request.new(env), {})
-        end
     end
 
     module Runner
@@ -364,6 +361,14 @@ module ActionDispatch
         end
       end
 
+      extend ActiveSupport::Concern
+      include ActionDispatch::Routing::UrlFor
+
+      def url_options
+        reset! unless @integration_session
+        @integration_session.url_options
+      end
+
       # Delegate unhandled messages to the current session instance.
       def method_missing(sym, *args, &block)
         reset! unless @integration_session