aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2010-03-09 21:00:24 -0600
committerJoshua Peek <josh@joshpeek.com>2010-03-09 21:00:24 -0600
commit4d2470f7daad8cebd0a69f5ea0509a41af0596b8 (patch)
tree9d936a15be606aa53ddb027b09e77622bd851b84 /actionpack/test
parente38ea982ff8fea5b616297b458ca2c669de0d659 (diff)
downloadrails-4d2470f7daad8cebd0a69f5ea0509a41af0596b8.tar.gz
rails-4d2470f7daad8cebd0a69f5ea0509a41af0596b8.tar.bz2
rails-4d2470f7daad8cebd0a69f5ea0509a41af0596b8.zip
RouteSet#rewrite => url_for
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/caching_test.rb4
-rw-r--r--actionpack/test/controller/url_rewriter_test.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 08efd5a48c..8a0c118d3c 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -81,9 +81,9 @@ class PageCachingTest < ActionController::TestCase
match '/', :to => 'posts#index', :as => :main
end
@params[:format] = 'rss'
- assert_equal '/posts.rss', @router.rewrite(@params)
+ assert_equal '/posts.rss', @router.url_for(@params)
@params[:format] = nil
- assert_equal '/', @router.rewrite(@params)
+ assert_equal '/', @router.url_for(@params)
end
end
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index cf775846df..7b46a48a1d 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -11,7 +11,7 @@ class UrlRewriterTests < ActionController::TestCase
end
def rewrite(router, options)
- router.rewrite(@options.merge(options))
+ router.url_for(@options.merge(options))
end
end