1 files changed, 16 insertions, 0 deletions
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index bc171e201b..d8b04119f2 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -78,6 +78,14 @@ end
 class DefaultLayoutController < LayoutTest
 end
 
+class StreamingLayoutController < LayoutTest
+  def render(*args)
+    options = args.extract_options!
+    options[:stream] = true
+    super(*(args << options))
+  end
+end
+
 class AbsolutePathLayoutController < LayoutTest
   layout File.expand_path(File.expand_path(__FILE__) + '/../../fixtures/layout_tests/layouts/layout_test')
 end
@@ -122,6 +130,14 @@ class LayoutSetInResponseTest < ActionController::TestCase
     assert_template :layout => "layouts/layout_test"
   end
 
+  if RUBY_VERSION >= '1.9'
+    def test_layout_set_when_using_streaming_layout
+      @controller = StreamingLayoutController.new
+      get :hello
+      assert_template :hello
+    end
+  end
+
   def test_layout_set_when_set_in_controller
     @controller = HasOwnLayoutController.new
     get :hello