diff options
| author | Yehuda Katz <wycats@Yehuda-Katz.local> | 2009-12-10 13:11:15 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@Yehuda-Katz.local> | 2009-12-10 13:11:15 -0800 |
| commit | 8b9275340f6845f1fd3ad8fc43d66a95a73b0c2d (patch) | |
| tree | 2acb83debd9772fb0719dbb9ce23c70c5dd953b5 /actionpack/test/controller/mime_responds_test.rb | |
| parent | 2ecfa817c95f98247d1bd7fb28b208d3f950b43f (diff) | |
| parent | ec5434c3c2631bb47b568eede397c3bd596eeb88 (diff) | |
| download | rails-8b9275340f6845f1fd3ad8fc43d66a95a73b0c2d.tar.gz rails-8b9275340f6845f1fd3ad8fc43d66a95a73b0c2d.tar.bz2 rails-8b9275340f6845f1fd3ad8fc43d66a95a73b0c2d.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller/mime_responds_test.rb')
| -rw-r--r-- | actionpack/test/controller/mime_responds_test.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb index c857d85c39..6b9cace9cd 100644 --- a/actionpack/test/controller/mime_responds_test.rb +++ b/actionpack/test/controller/mime_responds_test.rb @@ -853,9 +853,11 @@ class RespondWithControllerTest < ActionController::TestCase def with_test_route_set with_routing do |set| set.draw do |map| - map.resources :customers - map.resources :quiz_stores, :has_many => :customers - map.connect ":controller/:action/:id" + resources :customers + resources :quiz_stores do + resources :customers + end + match ":controller/:action" end yield end |