1 files changed, 25 insertions, 0 deletions
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 28d64c6043..f92e9dae48 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -5,12 +5,21 @@ class TestTest < Test::Unit::TestCase
     def set_flash
       flash["test"] = ">#{flash["test"]}<"
     end
+
+    def test_uri
+      render_text @request.request_uri
+    end
   end
 
   def setup
     @controller = TestController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    ActionController::Routing::Routes.reload
+  end
+
+  def teardown
+    ActionController::Routing::Routes.reload
   end
 
   def test_process_without_flash
@@ -22,4 +31,20 @@ class TestTest < Test::Unit::TestCase
     process :set_flash, nil, nil, { "test" => "value" }
     assert_flash_equal ">value<", "test"
   end
+
+  def test_process_with_request_uri_with_no_params
+    process :test_uri
+    assert_equal @response.body, "/test_test/test/test_uri"
+  end
+
+  def test_process_with_request_uri_with_params
+    process :test_uri, :id => 7
+    assert_equal @response.body, "/test_test/test/test_uri/7"
+  end
+
+  def test_process_with_request_uri_with_params_with_explicit_uri
+    @request.set_REQUEST_URI "/explicit/uri"
+    process :test_uri, :id => 7
+    assert_equal @response.body, "/explicit/uri"
+  end
 end