Permalink
Browse files

Heckling ActionController::Resources::Resource revealed that set_pref…

…ixes 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
  • Loading branch information...
1 parent 4733182 commit 582c028b14bff4229eae5e45a2d4f886a5865ed3 @technoweenie technoweenie committed Jan 17, 2007
Showing with 16 additions and 7 deletions.
  1. +2 −0 actionpack/CHANGELOG
  2. +14 −7 actionpack/test/controller/resources_test.rb
View
@@ -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]
@@ -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

0 comments on commit 582c028

Please sign in to comment.