Final pass at removing the router from a global constant

4 files changed, 1 insertions, 9 deletions

diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb
index 2cc7fe5344..5bc3205c51 100644
--- a/actionpack/lib/action_dispatch/routing.rb
+++ b/actionpack/lib/action_dispatch/routing.rb
@@ -204,7 +204,6 @@ module ActionDispatch
     autoload :DeprecatedMapper, 'action_dispatch/routing/deprecated_mapper'
     autoload :Mapper, 'action_dispatch/routing/mapper'
     autoload :Route, 'action_dispatch/routing/route'
-    autoload :Routes, 'action_dispatch/routing/routes'
     autoload :RouteSet, 'action_dispatch/routing/route_set'
     autoload :UrlFor, 'action_dispatch/routing/url_for'
 
diff --git a/actionpack/lib/action_dispatch/routing/routes.rb b/actionpack/lib/action_dispatch/routing/routes.rb
deleted file mode 100644
index 34afada9c9..0000000000
--- a/actionpack/lib/action_dispatch/routing/routes.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# A singleton that stores the current route set
-# ActionDispatch::Routing::Routes = ActionDispatch::Routing::RouteSet.new
-
-# To preserve compatibility with pre-3.0 Rails action_controller/deprecated.rb
-# defines ActionDispatch::Routing::Routes as an alias
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index f281febbc5..17caa2e030 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -125,7 +125,7 @@ module ActionDispatch
       end
 
       # A helper to make it easier to test different route configurations.
-      # This method temporarily replaces ActionDispatch::Routing::Routes
+      # This method temporarily replaces @router
       # with a new RouteSet instance.
       #
       # The new instance is yielded to the passed block. Typically the block
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 3b9d8b0318..3bd9502e91 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -188,11 +188,9 @@ module ActionDispatch
         unless defined? @named_routes_configured
           # install the named routes in this session instance.
           klass = singleton_class
-          # ActionDispatch::Routing::Routes.install_helpers(klass)
 
           # the helpers are made protected by default--we make them public for
           # easier access during testing and troubleshooting.
-          # klass.module_eval { public *ActionDispatch::Routing::Routes.named_routes.helpers }
           @named_routes_configured = true
         end
       end