diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-17 19:46:32 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-17 19:46:32 -0300 |
| commit | 4b339f44bdaa307004db2345ac9c950d9f508814 (patch) | |
| tree | 855748bc8f1df1a8b1d327810be229af05ee522e /actionpack/test/controller/redirect_test.rb | |
| parent | c01c8967a02537f132d437d5ae15332982119651 (diff) | |
| parent | 25e5b0c4a8d0045715a6ad11e2898585826e4e9b (diff) | |
| download | rails-4b339f44bdaa307004db2345ac9c950d9f508814.tar.gz rails-4b339f44bdaa307004db2345ac9c950d9f508814.tar.bz2 rails-4b339f44bdaa307004db2345ac9c950d9f508814.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test/controller/redirect_test.rb')
| -rw-r--r-- | actionpack/test/controller/redirect_test.rb | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb index 7755af592d..ea278fd8f0 100644 --- a/actionpack/test/controller/redirect_test.rb +++ b/actionpack/test/controller/redirect_test.rb @@ -231,18 +231,20 @@ class RedirectTest < ActionController::TestCase end def test_redirect_to_record - ActionController::Routing::Routes.draw do |map| - map.resources :workshops - map.connect ':controller/:action/:id' + with_routing do |set| + set.draw do |map| + map.resources :workshops + map.connect ':controller/:action/:id' + end + + get :redirect_to_existing_record + assert_equal "http://test.host/workshops/5", redirect_to_url + assert_redirected_to Workshop.new(5, false) + + get :redirect_to_new_record + assert_equal "http://test.host/workshops", redirect_to_url + assert_redirected_to Workshop.new(5, true) end - - get :redirect_to_existing_record - assert_equal "http://test.host/workshops/5", redirect_to_url - assert_redirected_to Workshop.new(5, false) - - get :redirect_to_new_record - assert_equal "http://test.host/workshops", redirect_to_url - assert_redirected_to Workshop.new(5, true) end def test_redirect_to_nil |