2 files changed, 21 insertions, 1 deletions
diff --git a/actionpack/test/new_base/base_test.rb b/actionpack/test/new_base/base_test.rb
index 95fdfd6b56..27d1a7f026 100644
--- a/actionpack/test/new_base/base_test.rb
+++ b/actionpack/test/new_base/base_test.rb
@@ -84,6 +84,6 @@ module Dispatching
     def test_controller_name
       assert_equal 'empty', EmptyController.controller_name
       assert_equal 'contained_empty', Submodule::ContainedEmptyController.controller_name
-   end
+    end
   end
 end
 \ No newline at end of file
diff --git a/actionpack/test/new_base/render_test.rb b/actionpack/test/new_base/render_test.rb
new file mode 100644
index 0000000000..9ad79124b8
--- /dev/null
+++ b/actionpack/test/new_base/render_test.rb
@@ -0,0 +1,20 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+
+module Render
+  class DoubleRenderController < ActionController::Base2
+    def index
+      render :text => "hello"
+      render :text => "world"
+    end
+  end
+  
+  class TestBasic < SimpleRouteCase
+    describe "Rendering more than once"
+    
+    test "raises an exception" do
+      assert_raises(AbstractController::DoubleRenderError) do
+        get "/render/double_render"
+      end
+    end
+  end
+end
+\ No newline at end of file