diff options
author | José Valim <jose.valim@gmail.com> | 2010-03-10 22:17:44 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-03-10 22:17:44 +0100 |
commit | 84f6da45a19d335be320991cab44f492f61dc5c7 (patch) | |
tree | fcae699ac5cccf109ecc26d42bdbc039405f4501 /actionpack/test/controller/caching_test.rb | |
parent | 07cf49aadf3195db6ddefc58932efc88a6704a09 (diff) | |
parent | 181c414baa877d748671d03fb09499c10f81ec02 (diff) | |
download | rails-84f6da45a19d335be320991cab44f492f61dc5c7.tar.gz rails-84f6da45a19d335be320991cab44f492f61dc5c7.tar.bz2 rails-84f6da45a19d335be320991cab44f492f61dc5c7.zip |
Merge branch 'master' of gitproxy:rails/rails
Diffstat (limited to 'actionpack/test/controller/caching_test.rb')
-rw-r--r-- | actionpack/test/controller/caching_test.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb index 2be91893d4..a3c8fdbb6e 100644 --- a/actionpack/test/controller/caching_test.rb +++ b/actionpack/test/controller/caching_test.rb @@ -63,8 +63,7 @@ class PageCachingTest < ActionController::TestCase @controller = PageCachingTestController.new @controller.cache_store = :file_store, FILE_STORE_PATH - @params = {:controller => 'posts', :action => 'index', :only_path => true, :skip_relative_url_root => true} - @rewriter = ActionController::UrlRewriter + @params = {:controller => 'posts', :action => 'index', :only_path => true} FileUtils.rm_rf(File.dirname(FILE_STORE_PATH)) FileUtils.mkdir_p(FILE_STORE_PATH) @@ -82,9 +81,9 @@ class PageCachingTest < ActionController::TestCase match '/', :to => 'posts#index', :as => :main end @params[:format] = 'rss' - assert_equal '/posts.rss', @rewriter.rewrite(@router, @params) + assert_equal '/posts.rss', @router.url_for(@params) @params[:format] = nil - assert_equal '/', @rewriter.rewrite(@router, @params) + assert_equal '/', @router.url_for(@params) end end |