Use with_routing helper in tests instead of modifying global route set

actionpack/test/controller/caching_test.rb

@@ -46,14 +46,8 @@ def trailing_slash
 class PageCachingTest < ActionController::TestCase
   def setup
     super
-    ActionController::Base.perform_caching = true
 
-    ActionController::Routing::Routes.draw do |map|
+    ActionController::Base.perform_caching = true
-      map.main '', :controller => 'posts', :format => nil
-      map.formatted_posts 'posts.:format', :controller => 'posts'
-      map.resources :posts
-      map.connect ':controller/:action/:id'
-    end
 
     @request = ActionController::TestRequest.new
     @request.host = 'hostname.com'
@@ -74,11 +68,17 @@ def teardown
   end
 
   def test_page_caching_resources_saves_to_correct_path_with_extension_even_if_default_route
+    with_routing do |set|
+      set.draw do |map|
+        map.main '', :controller => 'posts', :format => nil
+        map.formatted_posts 'posts.:format', :controller => 'posts'
+      end
       @params[:format] = 'rss'
       assert_equal '/posts.rss', @rewriter.rewrite(@params)
       @params[:format] = nil
       assert_equal '/', @rewriter.rewrite(@params)
     end
+  end
 
   def test_should_cache_get_with_ok_status
     get :ok

actionpack/test/controller/mime_responds_test.rb

@@ -527,12 +527,6 @@ def setup
     super
     ActionController::Base.use_accept_header = true
     @request.host = "www.example.com"
-
-    ActionController::Routing::Routes.draw do |map|
-      map.resources :customers
-      map.resources :quiz_stores, :has_many => :customers
-      map.connect ":controller/:action/:id"
-    end
   end
 
   def teardown
@@ -593,6 +587,7 @@ def test_using_resource
   end
 
   def test_using_resource_for_post_with_html
+    with_test_route_set do
       post :using_resource
       assert_equal "text/html", @response.content_type
       assert_equal 302, @response.status
@@ -607,8 +602,10 @@ def test_using_resource_for_post_with_html
       assert_equal "New world!\n", @response.body
       assert_nil @response.location
     end
+  end
 
   def test_using_resource_for_post_with_xml
+    with_test_route_set do
       @request.accept = "application/xml"
 
       post :using_resource
@@ -625,8 +622,10 @@ def test_using_resource_for_post_with_xml
       assert_equal errors.to_xml, @response.body
       assert_nil @response.location
     end
+  end
 
   def test_using_resource_for_put_with_html
+    with_test_route_set do
       put :using_resource
       assert_equal "text/html", @response.content_type
       assert_equal 302, @response.status
@@ -641,6 +640,7 @@ def test_using_resource_for_put_with_html
       assert_equal "Edit world!\n", @response.body
       assert_nil @response.location
     end
+  end
 
   def test_using_resource_for_put_with_xml
     @request.accept = "application/xml"
@@ -660,12 +660,14 @@ def test_using_resource_for_put_with_xml
   end
 
   def test_using_resource_for_delete_with_html
+    with_test_route_set do
       Customer.any_instance.stubs(:destroyed?).returns(true)
       delete :using_resource
       assert_equal "text/html", @response.content_type
       assert_equal 302, @response.status
       assert_equal "http://www.example.com/customers", @response.location
     end
+  end
 
   def test_using_resource_for_delete_with_xml
     Customer.any_instance.stubs(:destroyed?).returns(true)
@@ -685,6 +687,7 @@ def test_using_resource_with_parent_for_get
   end
 
   def test_using_resource_with_parent_for_post
+    with_test_route_set do
       @request.accept = "application/xml"
 
       post :using_resource_with_parent
@@ -701,6 +704,7 @@ def test_using_resource_with_parent_for_post
       assert_equal errors.to_xml, @response.body
       assert_nil @response.location
     end
+  end
 
   def test_using_resource_with_collection
     @request.accept = "application/xml"
@@ -773,6 +777,18 @@ def test_not_acceptable
     get :default_overwritten
     assert_equal 406, @response.status
   end
+
+  private
+    def with_test_route_set
+      with_routing do |set|
+        set.draw do |map|
+          map.resources :customers
+          map.resources :quiz_stores, :has_many => :customers
+          map.connect ":controller/:action/:id"
+        end
+        yield
+      end
+    end
 end
 
 class AbstractPostController < ActionController::Base

actionpack/test/controller/verification_test.rb

@@ -111,13 +111,6 @@ def unconditional_redirect
 
   tests TestController
 
-  setup do
-    ActionController::Routing::Routes.draw do |map|
-      map.foo '/foo', :controller => 'test', :action => 'foo'
-      map.connect ":controller/:action/:id"
-    end
-  end
-
   def test_using_symbol_back_with_no_referrer
     assert_raise(ActionController::RedirectBackError) { get :guarded_with_back }
   end
@@ -130,10 +123,16 @@ def test_using_symbol_back_redirects_to_referrer
 
   def test_no_deprecation_warning_for_named_route
     assert_not_deprecated do
+      with_routing do |set|
+        set.draw do |map|
+          map.foo '/foo', :controller => 'test', :action => 'foo'
+          map.connect ":controller/:action/:id"
+        end
         get :guarded_one_for_named_route_test, :two => "not one"
         assert_redirected_to '/foo'
       end
     end
+  end
 
   def test_guarded_one_with_prereqs
     get :guarded_one, :one => "here"

actionpack/test/template/test_test.rb

@@ -19,27 +19,24 @@ def link_to_person(person)
 end
 
 class PeopleHelperTest < ActionView::TestCase
-  def setup
-    super
-    ActionController::Routing::Routes.draw do |map|
-      map.people 'people', :controller => 'people', :action => 'index'
-      map.connect ':controller/:action/:id'
-    end
-  end
-
   def test_title
     assert_equal "<h1>Ruby on Rails</h1>", title("Ruby on Rails")
   end
 
   def test_homepage_path
+    with_test_route_set do
       assert_equal "/people", homepage_path
     end
+  end
 
   def test_homepage_url
+    with_test_route_set do
       assert_equal "http://test.host/people", homepage_url
     end
+  end
 
   def test_link_to_person
+    with_test_route_set do
       person = mock(:name => "David")
       person.class.extend ActiveModel::Naming
       expects(:mocha_mock_path).with(person).returns("/people/1")
@@ -47,6 +44,18 @@ def test_link_to_person
     end
   end
 
+  private
+    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'
+        end
+        yield
+      end
+    end
+end
+
 class CrazyHelperTest < ActionView::TestCase
   tests PeopleHelper