diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-04-28 13:41:21 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-04-28 13:41:21 -0700 |
| commit | b9ab4c780af82c1c60d63c50f040a55da5bfa8db (patch) | |
| tree | 4df8981047957fce17c10ea5c6aac7955aef2a4d /actionpack/test/dispatch | |
| parent | 8f1a5bfee1305f193bb659c010ca7e2272c12051 (diff) | |
| parent | 22184930ea323872c73542767d447bbbd7878c96 (diff) | |
| download | rails-b9ab4c780af82c1c60d63c50f040a55da5bfa8db.tar.gz rails-b9ab4c780af82c1c60d63c50f040a55da5bfa8db.tar.bz2 rails-b9ab4c780af82c1c60d63c50f040a55da5bfa8db.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test/dispatch')
| -rw-r--r-- | actionpack/test/dispatch/routing_test.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index 5bca476b27..b508996467 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -237,8 +237,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest AltRoutes = ActionDispatch::Routing::RouteSet.new(AltRequest) AltRoutes.draw do - get "/" => XHeader.new, :constraints => {:x_header => /HEADER/} - get "/" => AltApp.new + get "/" => TestRoutingMapper::TestAltApp::XHeader.new, :constraints => {:x_header => /HEADER/} + get "/" => TestRoutingMapper::TestAltApp::AltApp.new end def app @@ -1000,6 +1000,12 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest end end + def test_assert_recognizes_account_overview + with_test_routes do + assert_recognizes({:controller => "account", :action => "overview"}, "/account/overview") + end + end + private def with_test_routes yield |