diff options
| author | José Valim <jose.valim@gmail.com> | 2009-11-02 23:46:00 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-11-02 23:46:00 -0200 |
| commit | d002826e54415a340e55fdbf363d005faebf8fc5 (patch) | |
| tree | 431146dfb0b15c4507fd49bb7d6f18bd40ccf839 /actionpack/test/controller/verification_test.rb | |
| parent | 9ba83cce0318fa5051764f4a16c286adf30169e2 (diff) | |
| parent | 14370e1aab6ddfb5b86cf50bd7e5abcebae0684c (diff) | |
| download | rails-d002826e54415a340e55fdbf363d005faebf8fc5.tar.gz rails-d002826e54415a340e55fdbf363d005faebf8fc5.tar.bz2 rails-d002826e54415a340e55fdbf363d005faebf8fc5.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/test/controller/verification_test.rb')
| -rw-r--r-- | actionpack/test/controller/verification_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/verification_test.rb b/actionpack/test/controller/verification_test.rb index 1a9eb65f29..63e8cf3e61 100644 --- a/actionpack/test/controller/verification_test.rb +++ b/actionpack/test/controller/verification_test.rb @@ -125,8 +125,8 @@ class VerificationTest < ActionController::TestCase assert_not_deprecated do with_routing do |set| set.draw do |map| - map.foo '/foo', :controller => 'test', :action => 'foo' - map.connect ":controller/:action/:id" + match 'foo', :to => 'test#foo', :as => :foo + match 'verification_test/:action', :to => TestController end get :guarded_one_for_named_route_test, :two => "not one" assert_redirected_to '/foo' |