1 files changed, 14 insertions, 0 deletions
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 8ecc1c7d73..0326bf4562 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -25,6 +25,10 @@ class SendFileController < ActionController::Base
   end
 end
 
+class SendFileWithActionControllerLive < SendFileController
+  include ActionController::Live
+end
+
 class SendFileTest < ActionController::TestCase
   tests SendFileController
   include TestFileUtils
@@ -196,4 +200,14 @@ class SendFileTest < ActionController::TestCase
       assert_equal 200, @response.status
     end
   end
+
+  tests SendFileWithActionControllerLive
+
+  def test_send_file_with_action_controller_live
+    @controller = SendFileWithActionControllerLive.new
+    @controller.options = { :content_type => "application/x-ruby" }
+
+    response = process('file')
+    assert_equal 200, response.status
+  end
 end