From 582c028b14bff4229eae5e45a2d4f886a5865ed3 Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Wed, 17 Jan 2007 06:46:02 +0000 Subject: [PATCH] Heckling ActionController::Resources::Resource revealed that set_prefixes didn't break when :name_prefix was munged. #7081 [Kevin Clark] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5974 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/CHANGELOG | 2 ++ actionpack/test/controller/resources_test.rb | 21 +++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 2bd6fd50ec..d9b5f3eb54 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Heckling ActionController::Resources::Resource revealed that set_prefixes didn't break when :name_prefix was munged. #7081 [Kevin Clark] + * Fix #distance_of_time_in_words to report accurately against the Duration class. #7114 [eventualbuddha] * Refactor #form_tag to allow easy extending. [Rick] diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb index 0ae9240598..e424df3514 100644 --- a/actionpack/test/controller/resources_test.rb +++ b/actionpack/test/controller/resources_test.rb @@ -52,6 +52,12 @@ def test_multile_with_path_prefix assert_simply_restful_for :comments, :path_prefix => 'thread/5/', :options => { :thread_id => '5' } end end + + def test_with_name_prefix + with_restful_routing :messages, :name_prefix => 'post_' do + assert_simply_restful_for :messages, :name_prefix => 'post_' + end + end def test_with_collection_action rss_options = {:action => 'rss'} @@ -346,13 +352,14 @@ def assert_restful_named_routes_for(controller_name, singular_name = nil, option options[:options].delete :action full_prefix = "/#{options[:path_prefix]}#{controller_name}" - - assert_named_route "#{full_prefix}", "#{controller_name}_path", options[:options] - assert_named_route "#{full_prefix}.xml", "formatted_#{controller_name}_path", options[:options].merge(:format => 'xml') - assert_named_route "#{full_prefix}/new", "new_#{singular_name}_path", options[:options] - assert_named_route "#{full_prefix}/1", "#{singular_name}_path", options[:options].merge(:id => '1') - assert_named_route "#{full_prefix}/1;edit", "edit_#{singular_name}_path", options[:options].merge(:id => '1') - assert_named_route "#{full_prefix}/1.xml", "formatted_#{singular_name}_path", options[:options].merge(:format => 'xml', :id => '1') + name_prefix = options[:name_prefix] + + assert_named_route "#{full_prefix}", "#{name_prefix}#{controller_name}_path", options[:options] + assert_named_route "#{full_prefix}.xml", "formatted_#{name_prefix}#{controller_name}_path", options[:options].merge(:format => 'xml') + assert_named_route "#{full_prefix}/new", "#{name_prefix}new_#{singular_name}_path", options[:options] + assert_named_route "#{full_prefix}/1", "#{name_prefix}#{singular_name}_path", options[:options].merge(:id => '1') + assert_named_route "#{full_prefix}/1;edit", "#{name_prefix}edit_#{singular_name}_path", options[:options].merge(:id => '1') + assert_named_route "#{full_prefix}/1.xml", "formatted_#{name_prefix}#{singular_name}_path", options[:options].merge(:format => 'xml', :id => '1') yield options[:options] if block_given? end -- GitLab