aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-12-04 19:10:52 -0600
committerJoshua Peek <josh@joshpeek.com>2008-12-04 19:10:52 -0600
commit27ebfd795ff106efae8cbe318d7b15b1a3c63b13 (patch)
tree3cc7a72badb4151b457bf78c1417d39944c1d7bb /actionpack/test
parent148aff2097890a81e874a7c60bae5fa3b2a4d1fd (diff)
downloadrails-27ebfd795ff106efae8cbe318d7b15b1a3c63b13.tar.gz
rails-27ebfd795ff106efae8cbe318d7b15b1a3c63b13.tar.bz2
rails-27ebfd795ff106efae8cbe318d7b15b1a3c63b13.zip
Ensure route set is cleared on teardown
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/caching_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 10c65acd9a..7e7f488df6 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -67,7 +67,7 @@ class PageCachingTest < ActionController::TestCase
def teardown
FileUtils.rm_rf(File.dirname(FILE_STORE_PATH))
-
+ ActionController::Routing::Routes.clear!
ActionController::Base.perform_caching = false
end
@@ -401,7 +401,7 @@ class ActionCacheTest < ActionController::TestCase
def test_xml_version_of_resource_is_treated_as_different_cache
with_routing do |set|
- ActionController::Routing::Routes.draw do |map|
+ set.draw do |map|
map.connect ':controller/:action.:format'
map.connect ':controller/:action'
end