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/url_rewriter_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/url_rewriter_test.rb')
| -rw-r--r-- | actionpack/test/controller/url_rewriter_test.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb index 3bc8bec3fb..7b46a48a1d 100644 --- a/actionpack/test/controller/url_rewriter_test.rb +++ b/actionpack/test/controller/url_rewriter_test.rb @@ -1,8 +1,6 @@ require 'abstract_unit' require 'controller/fake_controllers' -ActionController::UrlRewriter - class UrlRewriterTests < ActionController::TestCase class Rewriter def initialize(request) @@ -13,8 +11,7 @@ class UrlRewriterTests < ActionController::TestCase end def rewrite(router, options) - options = @options.merge(options) - ActionController::UrlRewriter.rewrite(router, options) + router.url_for(@options.merge(options)) end end |