Start rewriting some internal tests to use the new routing dsl

actionpack/lib/action_controller/metal.rb

@@ -109,6 +109,10 @@ module ActionController
       middleware_stack
     end
 
+    def self.call(env)
+      action(env['action_dispatch.request.path_parameters'][:action]).call(env)
+    end
+
     # Return a rack endpoint for the given action. Memoize the endpoint, so
     # multiple calls into MyController.action will return the same object
     # for the same action.

actionpack/test/controller/integration_test.rb

@@ -390,7 +390,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest
     def with_test_route_set
       with_routing do |set|
         set.draw do |map|
-          map.connect "/:action", :controller => "integration_process_test/integration"
+          match ':action', :to => IntegrationController
         end
         yield
       end

actionpack/test/controller/rescue_test.rb

@@ -343,9 +343,9 @@ class RescueTest < ActionController::IntegrationTest
     def with_test_routing
       with_routing do |set|
         set.draw do |map|
-          map.connect 'foo', :controller => "rescue_test/test", :action => 'foo'
-          map.connect 'invalid', :controller => "rescue_test/test", :action => 'invalid'
-          map.connect 'b00m', :controller => "rescue_test/test", :action => 'b00m'
+          match 'foo', :to => TestController.action(:foo)
+          match 'invalid', :to => TestController.action(:invalid)
+          match 'b00m', :to => TestController.action(:b00m)
         end
         yield
       end

actionpack/test/controller/url_rewriter_test.rb

@@ -224,9 +224,8 @@ class UrlWriterTests < ActionController::TestCase
   def test_named_routes
     with_routing do |set|
       set.draw do |map|
-        map.no_args '/this/is/verbose', :controller => 'home', :action => 'index'
-        map.home '/home/sweet/home/:user', :controller => 'home', :action => 'index'
-        map.connect ':controller/:action/:id'
+        match 'this/is/verbose', :to => 'home#index', :as => :no_args
+        match 'home/sweet/home/:user', :to => 'home#index', :as => :home
       end
 
       # We need to create a new class in order to install the new named route.
@@ -264,7 +263,7 @@ class UrlWriterTests < ActionController::TestCase
   def test_only_path
     with_routing do |set|
       set.draw do |map|
-        map.home '/home/sweet/home/:user', :controller => 'home', :action => 'index'
+        match 'home/sweet/home/:user', :to => 'home#index', :as => :home
         map.connect ':controller/:action/:id'
       end
 
@@ -334,7 +333,6 @@ class UrlWriterTests < ActionController::TestCase
       set.draw do |map|
         map.main '', :controller => 'posts', :format => nil
         map.resources :posts
-        map.connect ':controller/:action/:id'
       end
 
       # We need to create a new class in order to install the new named route.

actionpack/test/controller/verification_test.rb

@@ -125,8 +125,8 @@ class VerificationTest < ActionController::TestCase
     assert_not_deprecated do
       with_routing do |set|
         set.draw do |map|
-          map.foo '/foo', :controller => 'test', :action => 'foo'
-          map.connect ":controller/:action/:id"
+          match 'foo', :to => 'test#foo', :as => :foo
+          match 'verification_test/:action', :to => TestController
         end
         get :guarded_one_for_named_route_test, :two => "not one"
         assert_redirected_to '/foo'

actionpack/test/dispatch/request/json_params_parsing_test.rb

@@ -57,7 +57,7 @@ class JsonParamsParsingTest < ActionController::IntegrationTest
     def with_test_routing
       with_routing do |set|
         set.draw do |map|
-          map.connect ':action', :controller => "json_params_parsing_test/test"
+          match ':action', :to => TestController
         end
         yield
       end

actionpack/test/dispatch/request/query_string_parsing_test.rb

@@ -109,7 +109,7 @@ class QueryStringParsingTest < ActionController::IntegrationTest
     def assert_parses(expected, actual)
       with_routing do |set|
         set.draw do |map|
-          map.connect ':action', :controller => "query_string_parsing_test/test"
+          match ':action', :to => TestController
         end
 
         get "/parse", actual

actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb

@@ -130,7 +130,7 @@ class UrlEncodedParamsParsingTest < ActionController::IntegrationTest
     def with_test_routing
       with_routing do |set|
         set.draw do |map|
-          map.connect ':action', :controller => "url_encoded_params_parsing_test/test"
+          match ':action', :to => TestController
         end
         yield
       end

actionpack/test/dispatch/request/xml_params_parsing_test.rb

@@ -84,7 +84,7 @@ class XmlParamsParsingTest < ActionController::IntegrationTest
     def with_test_routing
       with_routing do |set|
         set.draw do |map|
-          map.connect ':action', :controller => "xml_params_parsing_test/test"
+          match ':action', :to => TestController
         end
         yield
       end

actionpack/test/dispatch/session/cookie_store_test.rb

@@ -219,7 +219,7 @@ class CookieStoreTest < ActionController::IntegrationTest
     def with_test_route_set(options = {})
       with_routing do |set|
         set.draw do |map|
-          map.connect "/:action", :controller => "cookie_store_test/test"
+          match ':action', :to => TestController
         end
         options = {:key => SessionKey, :secret => SessionSecret}.merge(options)
         @app = ActionDispatch::Session::CookieStore.new(set, options)

actionpack/test/dispatch/session/mem_cache_store_test.rb

@@ -112,7 +112,7 @@ class MemCacheStoreTest < ActionController::IntegrationTest
     def with_test_route_set
       with_routing do |set|
         set.draw do |map|
-          map.connect "/:action", :controller => "mem_cache_store_test/test"
+          match ':action', :to => TestController
         end
         @app = ActionDispatch::Session::MemCacheStore.new(set, :key => '_session_id')
         yield

actionpack/test/template/test_test.rb

@@ -48,8 +48,7 @@ class PeopleHelperTest < ActionView::TestCase
     def with_test_route_set
       with_routing do |set|
         set.draw do |map|
-          map.people 'people', :controller => 'people', :action => 'index'
-          map.connect ':controller/:action/:id'
+          match 'people', :to => 'people#index', :as => :people
         end
         yield
       end