Permalink
Browse files

Merge pull request #15537 from tgxworld/fix_state_leak

Fix state leak.
  • Loading branch information...
2 parents eeb9a7c + 5cc7899 commit edc0f271978585635153068c708d62f5243dafe0 @matthewd matthewd committed Jun 20, 2014
@@ -593,7 +593,6 @@ def process(action, http_method = 'GET', *args)
unless @controller.respond_to?(:recycle!)
@controller.extend(Testing::Functional)
- @controller.class.class_eval { include Testing }
end
@request.recycle!
@@ -2,6 +2,8 @@
module BareMetalTest
class BareController < ActionController::Metal
+ include ActionController::RackDelegation
+
def index
self.response_body = "Hello world"
end
@@ -242,6 +242,8 @@ class MetalTestController < ActionController::Metal
include AbstractController::Rendering
include ActionView::Rendering
include ActionController::Rendering
+ include ActionController::RackDelegation
+
def accessing_logger_in_template
render :inline => "<%= logger.class %>"
@@ -387,10 +389,6 @@ def test_last_modified_works_with_less_than_too
class EtagRenderTest < ActionController::TestCase
tests TestControllerWithExtraEtags
- def setup
- super
- end
-
def test_multiple_etags
@request.if_none_match = etag(["123", 'ab', :cde, [:f]])
get :fresh
@@ -9,6 +9,7 @@ def file_data() @data ||= File.open(file_path, 'rb') { |f| f.read } end
class SendFileController < ActionController::Base
include TestFileUtils
+ include ActionController::Testing
layout "layouts/standard" # to make sure layouts don't interfere
attr_writer :options

0 comments on commit edc0f27

Please sign in to comment.