diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index 268301da648a71c6ef3b76f607929b40a5850855..69ee4b04ec2a1a85c3a9e1ebbe6ff726a9dfe583 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -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 \ 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 0bad9c37d69fc79632184ce6a4624ae05a57cfe4..88667d3570a3d5c855a7017d6aba2b9bb6b43738 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -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. diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index e0acbdd430c1f6e708ece6dc611f96e348dc4988..1213c9d99f10fd83e21e8d11b96e1508a1c86ca5 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -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 \ No newline at end of file