diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-08-16 21:14:26 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-08-16 21:14:26 -0500 |
| commit | 24ad9ae3d228acdf9aa31cf28bfe6dfb0139c247 (patch) | |
| tree | 8328606506d2db378a35905a0953b59b0e84cfdf /actionpack/test/controller/action_pack_assertions_test.rb | |
| parent | ccf28d2499d1b4e2aba41291eb800e0e02120923 (diff) | |
| download | rails-24ad9ae3d228acdf9aa31cf28bfe6dfb0139c247.tar.gz rails-24ad9ae3d228acdf9aa31cf28bfe6dfb0139c247.tar.bz2 rails-24ad9ae3d228acdf9aa31cf28bfe6dfb0139c247.zip | |
Cleanup route reloading in tests. Prefer with_routing over using ActionController::Routing::Routes directly
Diffstat (limited to 'actionpack/test/controller/action_pack_assertions_test.rb')
| -rw-r--r-- | actionpack/test/controller/action_pack_assertions_test.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb index ecbaba39d1..06827e5fbc 100644 --- a/actionpack/test/controller/action_pack_assertions_test.rb +++ b/actionpack/test/controller/action_pack_assertions_test.rb @@ -185,13 +185,9 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase # let's get this party started def setup super - ActionController::Routing::Routes.reload - ActionController::Routing.use_controllers!(%w(action_pack_assertions admin/inner_module user content admin/user)) - end - def teardown - super - ActionController::Routing::Routes.reload + ActionController::Routing.use_controllers!(%w(action_pack_assertions admin/inner_module user content admin/user)) + ActionController::Routing::Routes.load_routes! end # -- assertion-based testing ------------------------------------------------ |