aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/routing_test.rb
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2010-06-07 18:30:18 -0400
committerMikel Lindsaar <raasdnil@gmail.com>2010-06-07 18:30:18 -0400
commita16fd961310d4df5bd20df5fe64b2f764d8aa471 (patch)
tree0e54acc2ae35e985cd8c8175f051e281acbd4595 /actionpack/test/dispatch/routing_test.rb
parent735027e58d3000bd5d939e39deabfecef83ee20c (diff)
parentd6953cbfd3b6e06eceba715c60e288b6d7db0d49 (diff)
downloadrails-a16fd961310d4df5bd20df5fe64b2f764d8aa471.tar.gz
rails-a16fd961310d4df5bd20df5fe64b2f764d8aa471.tar.bz2
rails-a16fd961310d4df5bd20df5fe64b2f764d8aa471.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/test/dispatch/routing_test.rb')
-rw-r--r--actionpack/test/dispatch/routing_test.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 180889ddf2..ffa4f50b00 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -28,6 +28,10 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
post :reset
resource :info
+
+ member do
+ get :crush
+ end
end
match 'account/logout' => redirect("/logout"), :as => :logout_redirect
@@ -352,6 +356,14 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
end
end
+ def test_member_on_resource
+ with_test_routes do
+ get '/session/crush'
+ assert_equal 'sessions#crush', @response.body
+ assert_equal '/session/crush', crush_session_path
+ end
+ end
+
def test_redirect_modulo
with_test_routes do
get '/account/modulo/name'