From 24ad9ae3d228acdf9aa31cf28bfe6dfb0139c247 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 16 Aug 2009 21:14:26 -0500 Subject: Cleanup route reloading in tests. Prefer with_routing over using ActionController::Routing::Routes directly --- actionpack/test/abstract_unit.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'actionpack/test/abstract_unit.rb') diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index eb4e2fb585..b618c059a3 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -51,6 +51,10 @@ module ActionView ActionController::Routing::Routes.draw do |map| map.connect ':controller/:action/:id' end + + teardown do + ActionController::Routing::Routes.reload! + end end end end @@ -70,12 +74,17 @@ module ActionController class TestCase include TestProcess + setup do ActionController::Routing::Routes.draw do |map| map.connect ':controller/:action/:id' end end - + + teardown do + ActionController::Routing::Routes.reload! + end + def assert_template(options = {}, message = nil) validate_request! -- cgit v1.2.3 From ff1b0d3c86c2b26470a30a5edb958a365f00098e Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 16 Aug 2009 21:21:39 -0500 Subject: k, thats really slow, lets not --- actionpack/test/abstract_unit.rb | 8 -------- 1 file changed, 8 deletions(-) (limited to 'actionpack/test/abstract_unit.rb') diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index b618c059a3..a21b00915e 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -51,10 +51,6 @@ module ActionView ActionController::Routing::Routes.draw do |map| map.connect ':controller/:action/:id' end - - teardown do - ActionController::Routing::Routes.reload! - end end end end @@ -81,10 +77,6 @@ module ActionController end end - teardown do - ActionController::Routing::Routes.reload! - end - def assert_template(options = {}, message = nil) validate_request! -- cgit v1.2.3