diff options
| author | wycats <wycats@gmail.com> | 2010-04-11 14:53:17 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-11 14:53:17 -0700 |
| commit | 803df08d896b82ae3e86c9c1e3c2ea4b6826ef70 (patch) | |
| tree | b813371e844a9a05ba33beb6582335d3617f66ee /actionpack/test | |
| parent | 76e0a9eb5b5ad17d51dad5e4e8c5ea1ed504ea88 (diff) | |
| parent | 1f80b8b04f9783ea7a5f39bd7ce27248bc57a851 (diff) | |
| download | rails-803df08d896b82ae3e86c9c1e3c2ea4b6826ef70.tar.gz rails-803df08d896b82ae3e86c9c1e3c2ea4b6826ef70.tar.bz2 rails-803df08d896b82ae3e86c9c1e3c2ea4b6826ef70.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/dispatch/routing_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index d38c48bfd4..411a28d8ee 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -140,7 +140,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest namespace :account do match 'shorthand' - match 'description', :to => "account#description", :as => "description" + match 'description', :to => "description", :as => "description" resource :subscription, :credit, :credit_card root :to => "account#index" @@ -864,7 +864,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest with_test_routes do assert_equal '/account', account_root_path get '/account' - assert_equal 'account#index', @response.body + assert_equal 'account/account#index', @response.body end end |