diff options
| author | José Valim <jose.valim@gmail.com> | 2010-03-08 21:06:26 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-03-08 21:06:26 +0100 |
| commit | 7942e909608f24db0365943c5d9ad51cbb4d27b5 (patch) | |
| tree | 6a9b51155b9220dbf98d4b1c78d8edccabd231c5 /actionpack/test/dispatch | |
| parent | 36eb1a686c831d5a14998bb9ac7cc60efa363373 (diff) | |
| parent | ae93789d9ad9095ca21784287464b760db12a095 (diff) | |
| download | rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.tar.gz rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.tar.bz2 rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.zip | |
Merge master.
Diffstat (limited to 'actionpack/test/dispatch')
| -rw-r--r-- | actionpack/test/dispatch/routing_test.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index 37c2f1421b..b46276c453 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -24,6 +24,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest resource :session do get :create + + resource :info end match 'account/logout' => redirect("/logout"), :as => :logout_redirect @@ -234,6 +236,14 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest end end + def test_session_info_nested_singleton_resource + with_test_routes do + get '/session/info' + assert_equal 'infos#show', @response.body + assert_equal '/session/info', session_info_path + end + end + def test_redirect_modulo with_test_routes do get '/account/modulo/name' |