2 files changed, 34 insertions, 31 deletions

diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index 6302016a53..6ae26b739d 100755
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -1,44 +1,36 @@
 require File.dirname(__FILE__) + '/../abstract_unit'
 
-class RedirectTest < Test::Unit::TestCase
-  class RedirectController < ActionController::Base
-    def simple_redirect
-      redirect_to :action => "hello_world"
-    end
-    
-    def method_redirect
-      redirect_to :dashbord_url, 1, "hello"
-    end
-    
-    def rescue_errors(e) raise e end
-    
-    protected
-      def dashbord_url(id, message)
-        url_for :action => "dashboard", :params => { "id" => id, "message" => message }
-      end
+class RedirectController < ActionController::Base
+  def simple_redirect
+    redirect_to :action => "hello_world"
+  end
+  
+  def method_redirect
+    redirect_to :dashbord_url, 1, "hello"
   end
+  
+  def rescue_errors(e) raise e end
+  
+  protected
+    def dashbord_url(id, message)
+      url_for :action => "dashboard", :params => { "id" => id, "message" => message }
+    end
+end
 
+class RedirectTest < Test::Unit::TestCase
   def setup
-    @request  = ActionController::TestRequest.new
-    @response = ActionController::TestResponse.new
+    @controller = RedirectController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
   end
 
   def test_simple_redirect
-    @request.path = "/redirect/simple_redirect"
-    @request.action = "simple_redirect"
-    response = process_request
-    assert_equal "http://test.host/redirect/hello_world", response.headers["location"]
+    get :simple_redirect
+    assert_redirect_url "http://test.host/redirect/hello_world"
   end
 
   def test_redirect_with_method_reference_and_parameters
-    @request.path = "/redirect/method_redirect"
-    @request.action = "method_redirect"
-    response = process_request
-    assert_equal "http://test.host/redirect/dashboard?message=hello&id=1", response.headers["location"]
+    get :method_redirect
+    assert_redirect_url "http://test.host/redirect/dashboard?message=hello&id=1"
   end
-
-  private
-    def process_request
-      RedirectController.process(@request, @response)
-    end
 end
\ No newline at end of file
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index afffd15793..e471139d8f 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -59,6 +59,11 @@ class TestController < ActionController::Base
     render_action "list"
   end
 
+  def hello_in_a_string
+    @customers = [ Customer.new("david"), Customer.new("mary") ]
+    render_text "How's there? #{render_to_string("test/list")}"
+  end
+
   def rescue_action(e) raise end
     
   private
@@ -71,6 +76,7 @@ class TestController < ActionController::Base
 end
 
 TestController.template_root = File.dirname(__FILE__) + "/../fixtures/"
+Fun::GamesController.template_root = File.dirname(__FILE__) + "/../fixtures/"
 
 class TestLayoutController < ActionController::Base
   layout "layouts/standard"
@@ -175,6 +181,11 @@ class RenderTest < Test::Unit::TestCase
     assert_equal "Hello: davidHello: mary", process_request.body
   end
 
+  def test_render_to_string
+    @request.action = "hello_in_a_string"
+    assert_equal "How's there? Hello: davidHello: mary", process_request.body
+  end
+
   def test_nested_rendering
     @request.action = "hello_world"
     assert_equal "Living in a nested world", Fun::GamesController.process(@request, @response).body