Get URL helpers working again in integration tests.

1 files changed, 24 insertions, 24 deletions

diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 3bd9502e91..fb067601c8 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -219,17 +219,17 @@ 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)
-        # ROUTES TODO: @app.router is not guaranteed to exist, so a generic Rack
-        # application will not work here. This means that a generic Rack application
-        # integration test cannot call url_for, since the application will not have
-        # #router on it.
-        controller ?
-          controller.url_for(options) :
-          generic_url_rewriter.rewrite(SharedTestRoutes, options)
-      end
+      # # Returns the URL for the given options, according to the rules specified
+      # # in the application's routes.
+      # def url_for(options)
+      #   # ROUTES TODO: @app.router is not guaranteed to exist, so a generic Rack
+      #   # application will not work here. This means that a generic Rack application
+      #   # integration test cannot call url_for, since the application will not have
+      #   # #router on it.
+      #   controller ?
+      #     controller.url_for(options) :
+      #     generic_url_rewriter.rewrite(SharedTestRoutes, options)
+      # end
 
       private
 
@@ -283,19 +283,6 @@ module ActionDispatch
 
           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
@@ -367,6 +354,19 @@ module ActionDispatch
         end
       end
 
+      extend ActiveSupport::Concern
+      include ActionDispatch::Routing::UrlFor
+
+      def merge_options(options)
+        opts = super.reverse_merge(
+          :host => host,
+          :protocol => https? ? "https" : "http"
+        )
+
+        opts.merge!(:port => 443) if !opts.key?(:port) && https?
+        opts
+      end
+
       # Delegate unhandled messages to the current session instance.
       def method_missing(sym, *args, &block)
         reset! unless @integration_session