diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-12-11 12:40:22 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-12-11 12:40:22 +0000 |
| commit | 9b98362cda013f85406ae8b26922264d382794dd (patch) | |
| tree | 9842eeee02a1e2b571e0008b18c5a8b390256224 /actionpack/test/controller/caching_test.rb | |
| parent | ea12819adf5d5fa1e8ae07789478e18db887cda1 (diff) | |
| parent | 69387ce0169b95d3a170cfb1c66a7570b1746e37 (diff) | |
| download | rails-9b98362cda013f85406ae8b26922264d382794dd.tar.gz rails-9b98362cda013f85406ae8b26922264d382794dd.tar.bz2 rails-9b98362cda013f85406ae8b26922264d382794dd.zip | |
Merge commit 'mainstream/master'
Conflicts:
railties/doc/guides/html/activerecord_validations_callbacks.html
railties/doc/guides/source/activerecord_validations_callbacks.txt
Diffstat (limited to 'actionpack/test/controller/caching_test.rb')
| -rw-r--r-- | actionpack/test/controller/caching_test.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb index 7e7f488df6..ddf140ac3a 100644 --- a/actionpack/test/controller/caching_test.rb +++ b/actionpack/test/controller/caching_test.rb @@ -48,6 +48,7 @@ class PageCachingTest < ActionController::TestCase ActionController::Routing::Routes.draw do |map| map.main '', :controller => 'posts' + map.formatted_posts 'posts.:format', :controller => 'posts' map.resources :posts map.connect ':controller/:action/:id' end |