Fixed url rewriter confusion when the controller name was a substring of the controller_prefix

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@397 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 9 insertions, 1 deletions

diff --git a/actionpack/test/controller/url_test.rb b/actionpack/test/controller/url_test.rb
index 21575f513a..93c8eb464d 100644
--- a/actionpack/test/controller/url_test.rb
+++ b/actionpack/test/controller/url_test.rb
@@ -191,7 +191,6 @@ class UrlTest < Test::Unit::TestCase
     assert_equal "http://www.singlefile.com/login/logout", @clean_url_with_same_action_and_controller_name.rewrite(:action => "logout")
   end
 
-  # FIXME
   def xtest_same_module_and_controller_and_action_names
     assert_equal "http://www.singlefile.com/login/login/logout", @clean_url_with_same_action_and_controller_and_module_name.rewrite(:action => "logout")
   end
@@ -408,4 +407,13 @@ class UrlTest < Test::Unit::TestCase
     assert_equal("http://example.com/controller/foo", url.rewrite(:action => 'foo'))
   end
 
+  def test_rewriting_on_similar_fragments
+    url = ActionController::UrlRewriter.new(
+      MockRequest.new(
+        "http://", "example.com", 80, "/advertisements/advert/",
+        {"controller"=>"advert", "action"=>"index"}
+      ), "advert", "index"
+    )
+    assert_equal("http://example.com/advertisements/advert/news", url.rewrite(:action => 'news'))
+  end
 end