Permalink
Browse files

Remove traces of SharedTestRoutes from user code; leave it as a stand…

…in for Rails.application.routes in Rails internal tests
  • Loading branch information...
1 parent 5797575 commit 3bad24c85d973295df55a04272a4e1829eab4685 Carlhuda committed Feb 26, 2010
@@ -33,7 +33,6 @@ class Railtie < Rails::Railtie
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
@@ -219,18 +219,6 @@ def host!(name)
@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.
@@ -257,7 +257,6 @@ def assert_template(options = {}, message = nil)
# 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

0 comments on commit 3bad24c

Please sign in to comment.