Use with_routing helper in tests instead of modifying global route set

4 files changed, 125 insertions, 101 deletions

diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 1a9f95e5e9..69b0eb5e3e 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -46,14 +46,8 @@ end
 class PageCachingTest < ActionController::TestCase
   def setup
     super
-    ActionController::Base.perform_caching = true
 
-    ActionController::Routing::Routes.draw do |map|
-      map.main '', :controller => 'posts', :format => nil
-      map.formatted_posts 'posts.:format', :controller => 'posts'
-      map.resources :posts
-      map.connect ':controller/:action/:id'
-    end
+    ActionController::Base.perform_caching = true
 
     @request = ActionController::TestRequest.new
     @request.host = 'hostname.com'
@@ -74,10 +68,16 @@ class PageCachingTest < ActionController::TestCase
   end
 
   def test_page_caching_resources_saves_to_correct_path_with_extension_even_if_default_route
-    @params[:format] = 'rss'
-    assert_equal '/posts.rss', @rewriter.rewrite(@params)
-    @params[:format] = nil
-    assert_equal '/', @rewriter.rewrite(@params)
+    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
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 93a815adae..a79648396c 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -527,12 +527,6 @@ class RespondWithControllerTest < ActionController::TestCase
     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,53 +587,59 @@ class RespondWithControllerTest < ActionController::TestCase
   end
 
   def test_using_resource_for_post_with_html
-    post :using_resource
-    assert_equal "text/html", @response.content_type
-    assert_equal 302, @response.status
-    assert_equal "http://www.example.com/customers/13", @response.location
-    assert @response.redirect?
-
-    errors = { :name => :invalid }
-    Customer.any_instance.stubs(:errors).returns(errors)
-    post :using_resource
-    assert_equal "text/html", @response.content_type
-    assert_equal 200, @response.status
-    assert_equal "New world!\n", @response.body
-    assert_nil @response.location
+    with_test_route_set do
+      post :using_resource
+      assert_equal "text/html", @response.content_type
+      assert_equal 302, @response.status
+      assert_equal "http://www.example.com/customers/13", @response.location
+      assert @response.redirect?
+
+      errors = { :name => :invalid }
+      Customer.any_instance.stubs(:errors).returns(errors)
+      post :using_resource
+      assert_equal "text/html", @response.content_type
+      assert_equal 200, @response.status
+      assert_equal "New world!\n", @response.body
+      assert_nil @response.location
+    end
   end
 
   def test_using_resource_for_post_with_xml
-    @request.accept = "application/xml"
-
-    post :using_resource
-    assert_equal "application/xml", @response.content_type
-    assert_equal 201, @response.status
-    assert_equal "<name>david</name>", @response.body
-    assert_equal "http://www.example.com/customers/13", @response.location
-
-    errors = { :name => :invalid }
-    Customer.any_instance.stubs(:errors).returns(errors)
-    post :using_resource
-    assert_equal "application/xml", @response.content_type
-    assert_equal 422, @response.status
-    assert_equal errors.to_xml, @response.body
-    assert_nil @response.location
+    with_test_route_set do
+      @request.accept = "application/xml"
+
+      post :using_resource
+      assert_equal "application/xml", @response.content_type
+      assert_equal 201, @response.status
+      assert_equal "<name>david</name>", @response.body
+      assert_equal "http://www.example.com/customers/13", @response.location
+
+      errors = { :name => :invalid }
+      Customer.any_instance.stubs(:errors).returns(errors)
+      post :using_resource
+      assert_equal "application/xml", @response.content_type
+      assert_equal 422, @response.status
+      assert_equal errors.to_xml, @response.body
+      assert_nil @response.location
+    end
   end
 
   def test_using_resource_for_put_with_html
-    put :using_resource
-    assert_equal "text/html", @response.content_type
-    assert_equal 302, @response.status
-    assert_equal "http://www.example.com/customers/13", @response.location
-    assert @response.redirect?
-
-    errors = { :name => :invalid }
-    Customer.any_instance.stubs(:errors).returns(errors)
-    put :using_resource
-    assert_equal "text/html", @response.content_type
-    assert_equal 200, @response.status
-    assert_equal "Edit world!\n", @response.body
-    assert_nil @response.location
+    with_test_route_set do
+      put :using_resource
+      assert_equal "text/html", @response.content_type
+      assert_equal 302, @response.status
+      assert_equal "http://www.example.com/customers/13", @response.location
+      assert @response.redirect?
+
+      errors = { :name => :invalid }
+      Customer.any_instance.stubs(:errors).returns(errors)
+      put :using_resource
+      assert_equal "text/html", @response.content_type
+      assert_equal 200, @response.status
+      assert_equal "Edit world!\n", @response.body
+      assert_nil @response.location
+    end
   end
 
   def test_using_resource_for_put_with_xml
@@ -660,11 +660,13 @@ class RespondWithControllerTest < ActionController::TestCase
   end
 
   def test_using_resource_for_delete_with_html
-    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
+    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
@@ -685,21 +687,23 @@ class RespondWithControllerTest < ActionController::TestCase
   end
 
   def test_using_resource_with_parent_for_post
-    @request.accept = "application/xml"
-
-    post :using_resource_with_parent
-    assert_equal "application/xml", @response.content_type
-    assert_equal 201, @response.status
-    assert_equal "<name>david</name>", @response.body
-    assert_equal "http://www.example.com/quiz_stores/11/customers/13", @response.location
-
-    errors = { :name => :invalid }
-    Customer.any_instance.stubs(:errors).returns(errors)
-    post :using_resource
-    assert_equal "application/xml", @response.content_type
-    assert_equal 422, @response.status
-    assert_equal errors.to_xml, @response.body
-    assert_nil @response.location
+    with_test_route_set do
+      @request.accept = "application/xml"
+
+      post :using_resource_with_parent
+      assert_equal "application/xml", @response.content_type
+      assert_equal 201, @response.status
+      assert_equal "<name>david</name>", @response.body
+      assert_equal "http://www.example.com/quiz_stores/11/customers/13", @response.location
+
+      errors = { :name => :invalid }
+      Customer.any_instance.stubs(:errors).returns(errors)
+      post :using_resource
+      assert_equal "application/xml", @response.content_type
+      assert_equal 422, @response.status
+      assert_equal errors.to_xml, @response.body
+      assert_nil @response.location
+    end
   end
 
   def test_using_resource_with_collection
@@ -773,6 +777,18 @@ class RespondWithControllerTest < ActionController::TestCase
     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
diff --git a/actionpack/test/controller/verification_test.rb b/actionpack/test/controller/verification_test.rb
index ee558f3465..1a9eb65f29 100644
--- a/actionpack/test/controller/verification_test.rb
+++ b/actionpack/test/controller/verification_test.rb
@@ -111,13 +111,6 @@ class VerificationTest < ActionController::TestCase
 
   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,8 +123,14 @@ class VerificationTest < ActionController::TestCase
 
   def test_no_deprecation_warning_for_named_route
     assert_not_deprecated do
-      get :guarded_one_for_named_route_test, :two => "not one"
-      assert_redirected_to '/foo'
+      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
 
diff --git a/actionpack/test/template/test_test.rb b/actionpack/test/template/test_test.rb
index f32d0b3d42..05a14f3554 100644
--- a/actionpack/test/template/test_test.rb
+++ b/actionpack/test/template/test_test.rb
@@ -19,32 +19,41 @@ module PeopleHelper
 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
-    assert_equal "/people", homepage_path
+    with_test_route_set do
+      assert_equal "/people", homepage_path
+    end
   end
 
   def test_homepage_url
-    assert_equal "http://test.host/people", homepage_url
+    with_test_route_set do
+      assert_equal "http://test.host/people", homepage_url
+    end
   end
 
   def test_link_to_person
-    person = mock(:name => "David")
-    person.class.extend ActiveModel::Naming
-    expects(:mocha_mock_path).with(person).returns("/people/1")
-    assert_equal '<a href="/people/1">David</a>', link_to_person(person)
+    with_test_route_set do
+      person = mock(:name => "David")
+      person.class.extend ActiveModel::Naming
+      expects(:mocha_mock_path).with(person).returns("/people/1")
+      assert_equal '<a href="/people/1">David</a>', link_to_person(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