From 3bad24c85d973295df55a04272a4e1829eab4685 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Fri, 26 Feb 2010 15:44:22 -0800
Subject: [PATCH] Remove traces of SharedTestRoutes from user code; leave it as
 a standin for Rails.application.routes in Rails internal tests

---
 actionpack/lib/action_controller/railtie.rb          |  1 -
 .../lib/action_dispatch/testing/integration.rb       | 12 ------------
 actionpack/test/abstract_unit.rb                     |  1 -
 3 files changed, 14 deletions(-)

diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 268301da64..69ee4b04ec 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -33,7 +33,6 @@ 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 0bad9c37d6..88667d3570 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -219,18 +219,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)
-      #   # 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
 
         # Performs the actual request.
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index e0acbdd430..1213c9d99f 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -257,7 +257,6 @@ end
 # This stub emulates the Railtie including the URL helpers from a Rails application
 module ActionController
   class Base
-    # ROUTES TODO: Rename SharedTestRoutes to something that reflects it's a standin for Rails.application
     include SharedTestRoutes.url_helpers
   end
 end
\ No newline at end of file