From 8760add31a0415b4635059cf7fadabc26946c0c2 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Thu, 25 Feb 2010 17:51:56 -0800
Subject: Get URL helpers working again in integration tests.

---
 actionpack/lib/action_controller/railtie.rb        |  2 +
 .../lib/action_dispatch/testing/integration.rb     | 48 +++++++++++-----------
 actionpack/test/controller/integration_test.rb     | 24 ++++-------
 3 files changed, 33 insertions(+), 41 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 3df70d4a4d..268301da64 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -32,6 +32,8 @@ module ActionController
 
     initializer "action_controller.url_helpers" do |app|
       ActionController::Base.extend ::ActionController::Railtie::UrlHelpers.with(app.routes)
+      ActionController::Routing::Routes = app.routes
+      ::SharedTestRoutes = app.routes
     end
   end
 end
\ No newline at end of file
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
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 29531d237a..1611a549fd 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -75,23 +75,6 @@ class SessionTest < Test::Unit::TestCase
     @session.delete_via_redirect(path, args, headers)
   end
 
-  def test_url_for_with_controller
-    options = {:action => 'show'}
-    mock_controller = mock()
-    mock_controller.expects(:url_for).with(options).returns('/show')
-    @session.stubs(:controller).returns(mock_controller)
-    assert_equal '/show', @session.url_for(options)
-  end
-
-  def test_url_for_without_controller
-    options = {:action => 'show'}
-    mock_rewriter = mock()
-    mock_rewriter.expects(:rewrite).with(SharedTestRoutes, options).returns('/show')
-    @session.stubs(:generic_url_rewriter).returns(mock_rewriter)
-    @session.stubs(:controller).returns(nil)
-    assert_equal '/show', @session.url_for(options)
-  end
-
   def test_get
     path = "/index"; params = "blah"; headers = {:location => 'blah'}
     @session.expects(:process).with(:get,path,params,headers)
@@ -238,6 +221,8 @@ class IntegrationTestUsesCorrectClass < ActionController::IntegrationTest
 end
 
 class IntegrationProcessTest < ActionController::IntegrationTest
+  include SharedTestRoutes.named_url_helpers
+
   class IntegrationController < ActionController::Base
     def get
       respond_to do |format|
@@ -410,12 +395,17 @@ class IntegrationProcessTest < ActionController::IntegrationTest
           match ':action', :to => controller
           get 'get/:action', :to => controller
         end
+
+        self.metaclass.send(:include, set.named_url_helpers)
+
         yield
       end
     end
 end
 
 class MetalIntegrationTest < ActionController::IntegrationTest
+  include SharedTestRoutes.named_url_helpers
+
   class Poller
     def self.call(env)
       if env["PATH_INFO"] =~ /^\/success/
-- 
cgit v1.2.3