1 files changed, 6 insertions, 34 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index cf22731823..19eee379fd 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -62,13 +62,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       match 'secure', :to => redirect("/secure/login")
 
       match 'mobile', :to => redirect(:subdomain => 'mobile')
-      match 'documentation', :to => redirect(:domain => 'example-documentation.com', :path => '')
-      match 'new_documentation', :to => redirect(:path => '/documentation/new')
       match 'super_new_documentation', :to => redirect(:host => 'super-docs.com')
 
-      match 'stores/:name',        :to => redirect(:subdomain => 'stores', :path => '/%{name}')
-      match 'stores/:name(*rest)', :to => redirect(:subdomain => 'stores', :path => '/%{name}%{rest}')
-
       match 'youtube_favorites/:youtube_id/:name', :to => redirect(YoutubeFavoritesRedirector)
 
       constraints(lambda { |req| true }) do
@@ -79,7 +74,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       match 'sign_in' => "sessions#new"
 
       match 'account/modulo/:name', :to => redirect("/%{name}s")
-      match 'account/proc/:name', :to => redirect {|params| "/#{params[:name].pluralize}" }
+      match 'account/proc/:name', :to => redirect {|params, req| "/#{params[:name].pluralize}" }
       match 'account/proc_req' => redirect {|params, req| "/#{req.method}" }
 
       match 'account/google' => redirect('http://www.google.com/', :status => 302)
@@ -711,20 +706,6 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
-  def test_redirect_hash_with_domain_and_path
-    with_test_routes do
-      get '/documentation'
-      verify_redirect 'http://www.example-documentation.com'
-    end
-  end
-
-  def test_redirect_hash_with_path
-    with_test_routes do
-      get '/new_documentation'
-      verify_redirect 'http://www.example.com/documentation/new'
-    end
-  end
-
   def test_redirect_hash_with_host
     with_test_routes do
       get '/super_new_documentation?section=top'
@@ -732,20 +713,6 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
-  def test_redirect_hash_path_substitution
-    with_test_routes do
-      get '/stores/iernest'
-      verify_redirect 'http://stores.example.com/iernest'
-    end
-  end
-
-  def test_redirect_hash_path_substitution_with_catch_all
-    with_test_routes do
-      get '/stores/iernest/products'
-      verify_redirect 'http://stores.example.com/iernest/products'
-    end
-  end
-
   def test_redirect_class
     with_test_routes do
       get '/youtube_favorites/oHg5SJYRHA0/rick-rolld'
@@ -2332,6 +2299,11 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal "/forced_collision", routes_forced_collision_path
   end
 
+  def test_redirect_argument_error
+    routes = Class.new { include ActionDispatch::Routing::Redirection }.new
+    assert_raises(ArgumentError) { routes.redirect Object.new }
+  end
+
   def test_explicitly_avoiding_the_named_route
     assert !respond_to?(:routes_no_collision_path)
   end