diff options
| author | Matthew Draper <matthew@trebex.net> | 2014-06-20 14:53:20 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-06-20 14:53:20 +0930 |
| commit | edc0f271978585635153068c708d62f5243dafe0 (patch) | |
| tree | 7e103d6c573bb43b9b672a1ad5c79aa8c4566103 /actionpack | |
| parent | eeb9a7c122a97e6d5061768443eb22b8678d4b15 (diff) | |
| parent | 5cc789930f323d2c1a5aa3506d64ab50123f862c (diff) | |
| download | rails-edc0f271978585635153068c708d62f5243dafe0.tar.gz rails-edc0f271978585635153068c708d62f5243dafe0.tar.bz2 rails-edc0f271978585635153068c708d62f5243dafe0.zip | |
Merge pull request #15537 from tgxworld/fix_state_leak
Fix state leak.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 1 | ||||
| -rw-r--r-- | actionpack/test/controller/new_base/bare_metal_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/render_test.rb | 6 | ||||
| -rw-r--r-- | actionpack/test/controller/send_file_test.rb | 1 |
4 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 849286a4a9..b117170514 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -593,7 +593,6 @@ module ActionController unless @controller.respond_to?(:recycle!) @controller.extend(Testing::Functional) - @controller.class.class_eval { include Testing } end @request.recycle! diff --git a/actionpack/test/controller/new_base/bare_metal_test.rb b/actionpack/test/controller/new_base/bare_metal_test.rb index 2ddc07ef72..246ba099af 100644 --- a/actionpack/test/controller/new_base/bare_metal_test.rb +++ b/actionpack/test/controller/new_base/bare_metal_test.rb @@ -2,6 +2,8 @@ require "abstract_unit" module BareMetalTest class BareController < ActionController::Metal + include ActionController::RackDelegation + def index self.response_body = "Hello world" end diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index 26806fb03f..9926130c02 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -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 @@ end 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 diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb index 73ed33ce2d..c002cf4d8f 100644 --- a/actionpack/test/controller/send_file_test.rb +++ b/actionpack/test/controller/send_file_test.rb @@ -9,6 +9,7 @@ end class SendFileController < ActionController::Base include TestFileUtils + include ActionController::Testing layout "layouts/standard" # to make sure layouts don't interfere attr_writer :options |