diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-17 19:46:32 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-17 19:46:32 -0300 |
| commit | 4b339f44bdaa307004db2345ac9c950d9f508814 (patch) | |
| tree | 855748bc8f1df1a8b1d327810be229af05ee522e /actionpack/test/controller/action_pack_assertions_test.rb | |
| parent | c01c8967a02537f132d437d5ae15332982119651 (diff) | |
| parent | 25e5b0c4a8d0045715a6ad11e2898585826e4e9b (diff) | |
| download | rails-4b339f44bdaa307004db2345ac9c950d9f508814.tar.gz rails-4b339f44bdaa307004db2345ac9c950d9f508814.tar.bz2 rails-4b339f44bdaa307004db2345ac9c950d9f508814.zip | |
Merge commit 'rails/master'
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 ------------------------------------------------ |