diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-10-17 17:26:50 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-10-17 17:35:21 -0500 |
commit | 702df0d2384609f1b0ee1cf3f068c823dc1b3a0d (patch) | |
tree | 695ac6379ecd87c31a686724f304831048c864ff /actionpack/test | |
parent | 6c2a73909ec71148cec60c46e11d57d40247bb63 (diff) | |
download | rails-702df0d2384609f1b0ee1cf3f068c823dc1b3a0d.tar.gz rails-702df0d2384609f1b0ee1cf3f068c823dc1b3a0d.tar.bz2 rails-702df0d2384609f1b0ee1cf3f068c823dc1b3a0d.zip |
Fix standalone run of routing test. Only reference controllers that are provided in fake_controllers
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/controller/routing_test.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index 1ceb1ab68c..5f160c1464 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -1345,20 +1345,20 @@ class RouteSetTest < ActiveSupport::TestCase set.draw do |map| map.connect ':controller/:action/:id' end - assert_equal '/post', set.generate( - {:controller => 'post', :action => 'index'}, - {:controller => 'post', :action => 'show', :id => '10'} + assert_equal '/books', set.generate( + {:controller => 'books', :action => 'index'}, + {:controller => 'books', :action => 'show', :id => '10'} ) end def test_query_params_will_be_shown_when_recalled set.draw do |map| - map.connect 'show_post/:parameter', :controller => 'post', :action => 'show' + map.connect 'show_weblog/:parameter', :controller => 'weblog', :action => 'show' map.connect ':controller/:action/:id' end - assert_equal '/post/edit?parameter=1', set.generate( + assert_equal '/weblog/edit?parameter=1', set.generate( {:action => 'edit', :parameter => 1}, - {:controller => 'post', :action => 'show', :parameter => 1} + {:controller => 'weblog', :action => 'show', :parameter => 1} ) end @@ -1380,9 +1380,9 @@ class RouteSetTest < ActiveSupport::TestCase def test_expiry_determination_should_consider_values_with_to_param set.draw { |map| map.connect 'projects/:project_id/:controller/:action' } - assert_equal '/projects/1/post/show', set.generate( + assert_equal '/projects/1/weblog/show', set.generate( {:action => 'show', :project_id => 1}, - {:controller => 'post', :action => 'show', :project_id => '1'}) + {:controller => 'weblog', :action => 'show', :project_id => '1'}) end def test_named_route_in_nested_resource |