Merge commit 'rails/master'

1 files changed, 17 insertions, 17 deletions

diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index 8877057070..b97ceb4594 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -177,17 +177,17 @@ class DefaultUrlOptionsTest < ActionController::TestCase
   end
 
   def test_default_url_options_are_used_if_set
-    ActionController::Routing::Routes.draw do |map|
-      map.default_url_options 'default_url_options', :controller => 'default_url_options'
-      map.connect ':controller/:action/:id'
-    end
+    with_routing do |set|
+      set.draw do |map|
+        map.default_url_options 'default_url_options', :controller => 'default_url_options'
+        map.connect ':controller/:action/:id'
+      end
 
-    get :default_url_options_action # Make a dummy request so that the controller is initialized properly.
+      get :default_url_options_action # Make a dummy request so that the controller is initialized properly.
 
-    assert_equal 'http://www.override.com/default_url_options/new?bacon=chunky', @controller.url_for(:controller => 'default_url_options')
-    assert_equal 'http://www.override.com/default_url_options?bacon=chunky', @controller.send(:default_url_options_url)
-  ensure
-    ActionController::Routing::Routes.load!
+      assert_equal 'http://www.override.com/default_url_options/new?bacon=chunky', @controller.url_for(:controller => 'default_url_options')
+      assert_equal 'http://www.override.com/default_url_options?bacon=chunky', @controller.send(:default_url_options_url)
+    end
   end
 end
 
@@ -206,15 +206,15 @@ class EmptyUrlOptionsTest < ActionController::TestCase
   end
 end
 
-class EnsureNamedRoutesWorksTicket22BugTest < Test::Unit::TestCase
+class EnsureNamedRoutesWorksTicket22BugTest < ActionController::TestCase
   def test_named_routes_still_work
-    ActionController::Routing::Routes.draw do |map|
-      map.resources :things
-    end
-    EmptyController.send :include, ActionController::UrlWriter
+    with_routing do |set|
+      set.draw do |map|
+        map.resources :things
+      end
+      EmptyController.send :include, ActionController::UrlWriter
 
-    assert_equal '/things', EmptyController.new.send(:things_path)
-  ensure
-    ActionController::Routing::Routes.load!
+      assert_equal '/things', EmptyController.new.send(:things_path)
+    end
   end
 end