0
@@ -1,5 +1,7 @@
0
 *1.13.0* (January 16th, 2007)
0
 
0
+* Heckling ActionController::Resources::Resource revealed that set_prefixes didn't break when :name_prefix was munged. #7081 [Kevin Clark]
0
+
0
 * Update to Prototype 1.5.0. [Sam Stephenson]
0
 
0
 * Allow exempt_from_layout :rhtml.  #6742, #7026 [dcmanges, Squeegy]

0
@@ -49,6 +49,12 @@ class ResourcesTest < Test::Unit::TestCase
0
       assert_simply_restful_for :comments, :path_prefix => 'thread/5/', :options => { :thread_id => '5' }
0
     end
0
   end
0
+  
0
+  def test_with_name_prefix
0
+    with_restful_routing :messages, :name_prefix => 'post_' do
0
+      assert_simply_restful_for :messages, :name_prefix => 'post_'
0
+    end
0
+  end
0
 
0
   def test_with_collection_action
0
     rss_options = {:action => 'rss'}
0
@@ -232,13 +238,14 @@ class ResourcesTest < Test::Unit::TestCase
0
       options[:options].delete :action
0
 
0
       full_prefix = "/#{options[:path_prefix]}#{controller_name}"
0
-
0
-      assert_named_route "#{full_prefix}",        "#{controller_name}_path",           options[:options]
0
-      assert_named_route "#{full_prefix}.xml",    "formatted_#{controller_name}_path", options[:options].merge(:format => 'xml')
0
-      assert_named_route "#{full_prefix}/new",    "new_#{singular_name}_path",         options[:options]
0
-      assert_named_route "#{full_prefix}/1",      "#{singular_name}_path",             options[:options].merge(:id => '1')
0
-      assert_named_route "#{full_prefix}/1;edit", "edit_#{singular_name}_path",        options[:options].merge(:id => '1')
0
-      assert_named_route "#{full_prefix}/1.xml",  "formatted_#{singular_name}_path",   options[:options].merge(:format => 'xml', :id => '1')
0
+      name_prefix = options[:name_prefix]
0
+
0
+      assert_named_route "#{full_prefix}",        "#{name_prefix}#{controller_name}_path",           options[:options]
0
+      assert_named_route "#{full_prefix}.xml",    "formatted_#{name_prefix}#{controller_name}_path", options[:options].merge(:format => 'xml')
0
+      assert_named_route "#{full_prefix}/new",    "#{name_prefix}new_#{singular_name}_path",         options[:options]
0
+      assert_named_route "#{full_prefix}/1",      "#{name_prefix}#{singular_name}_path",             options[:options].merge(:id => '1')
0
+      assert_named_route "#{full_prefix}/1;edit", "#{name_prefix}edit_#{singular_name}_path",        options[:options].merge(:id => '1')
0
+      assert_named_route "#{full_prefix}/1.xml",  "formatted_#{name_prefix}#{singular_name}_path",   options[:options].merge(:format => 'xml', :id => '1')
0
       yield options[:options] if block_given?
0
     end
0