From 06d1542ca7509da1cd414730e1066ae5ff8a08fa Mon Sep 17 00:00:00 2001
From: Jose and Yehuda <wycats@gmail.com>
Date: Tue, 24 Apr 2012 23:55:39 -0500
Subject: [PATCH] Clean up some straggling build failures

---
 actionmailer/test/i18n_with_controller_test.rb  |  2 +-
 actionmailer/test/url_test.rb                   |  4 ++--
 railties/test/application/route_inspect_test.rb | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/actionmailer/test/i18n_with_controller_test.rb b/actionmailer/test/i18n_with_controller_test.rb
index 7040ae6f8d148..68ed86e0d4b71 100644
--- a/actionmailer/test/i18n_with_controller_test.rb
+++ b/actionmailer/test/i18n_with_controller_test.rb
@@ -24,7 +24,7 @@ def send_mail
 class ActionMailerI18nWithControllerTest < ActionDispatch::IntegrationTest
   Routes = ActionDispatch::Routing::RouteSet.new
   Routes.draw do
-    match ':controller(/:action(/:id))'
+    get ':controller(/:action(/:id))'
   end
 
   def app
diff --git a/actionmailer/test/url_test.rb b/actionmailer/test/url_test.rb
index 0536e830984c5..2ea1723434ca3 100644
--- a/actionmailer/test/url_test.rb
+++ b/actionmailer/test/url_test.rb
@@ -57,8 +57,8 @@ def test_signed_up_with_url
     UrlTestMailer.delivery_method = :test
 
     AppRoutes.draw do
-      match ':controller(/:action(/:id))'
-      match '/welcome' => "foo#bar", :as => "welcome"
+      get ':controller(/:action(/:id))'
+      get '/welcome' => "foo#bar", :as => "welcome"
     end
 
     expected = new_mail
diff --git a/railties/test/application/route_inspect_test.rb b/railties/test/application/route_inspect_test.rb
index 574c2a204f2ba..59dfe2ff758f4 100644
--- a/railties/test/application/route_inspect_test.rb
+++ b/railties/test/application/route_inspect_test.rb
@@ -78,7 +78,7 @@ def test_inspect_routes_shows_root_route
         root :to => 'pages#main'
       end
       output = @inspector.format @set.routes
-      assert_equal ["root  / pages#main"], output
+      assert_equal ["root GET / pages#main"], output
     end
 
     def test_inspect_routes_shows_dynamic_action_route
@@ -86,7 +86,7 @@ def test_inspect_routes_shows_dynamic_action_route
         get 'api/:action' => 'api'
       end
       output = @inspector.format @set.routes
-      assert_equal ["  /api/:action(.:format) api#:action"], output
+      assert_equal [" GET /api/:action(.:format) api#:action"], output
     end
 
     def test_inspect_routes_shows_controller_and_action_only_route
@@ -94,7 +94,7 @@ def test_inspect_routes_shows_controller_and_action_only_route
         get ':controller/:action'
       end
       output = @inspector.format @set.routes
-      assert_equal ["  /:controller/:action(.:format) :controller#:action"], output
+      assert_equal [" GET /:controller/:action(.:format) :controller#:action"], output
     end
 
     def test_inspect_routes_shows_controller_and_action_route_with_constraints
@@ -102,7 +102,7 @@ def test_inspect_routes_shows_controller_and_action_route_with_constraints
         get ':controller(/:action(/:id))', :id => /\d+/
       end
       output = @inspector.format @set.routes
-      assert_equal ["  /:controller(/:action(/:id))(.:format) :controller#:action {:id=>/\\d+/}"], output
+      assert_equal [" GET /:controller(/:action(/:id))(.:format) :controller#:action {:id=>/\\d+/}"], output
     end
 
     def test_rake_routes_shows_route_with_defaults
@@ -110,7 +110,7 @@ def test_rake_routes_shows_route_with_defaults
         get 'photos/:id' => 'photos#show', :defaults => {:format => 'jpg'}
       end
       output = @inspector.format @set.routes
-      assert_equal [%Q[  /photos/:id(.:format) photos#show {:format=>"jpg"}]], output
+      assert_equal [%Q[ GET /photos/:id(.:format) photos#show {:format=>"jpg"}]], output
     end
 
     def test_rake_routes_shows_route_with_constraints
@@ -118,7 +118,7 @@ def test_rake_routes_shows_route_with_constraints
         get 'photos/:id' => 'photos#show', :id => /[A-Z]\d{5}/
       end
       output = @inspector.format @set.routes
-      assert_equal ["  /photos/:id(.:format) photos#show {:id=>/[A-Z]\\d{5}/}"], output
+      assert_equal [" GET /photos/:id(.:format) photos#show {:id=>/[A-Z]\\d{5}/}"], output
     end
 
     class RackApp
@@ -131,7 +131,7 @@ def test_rake_routes_shows_route_with_rack_app
         get 'foo/:id' => RackApp, :id => /[A-Z]\d{5}/
       end
       output = @inspector.format @set.routes
-      assert_equal ["  /foo/:id(.:format) #{RackApp.name} {:id=>/[A-Z]\\d{5}/}"], output
+      assert_equal [" GET /foo/:id(.:format) #{RackApp.name} {:id=>/[A-Z]\\d{5}/}"], output
     end
 
     def test_rake_routes_shows_route_with_rack_app_nested_with_dynamic_constraints