diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-27 11:25:15 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-27 11:25:15 -0800 |
| commit | 26306420a6f483f23172d84176bf6aa57548651f (patch) | |
| tree | f3968bf35da8e33ae98d2b63eaa2cc0e401fe794 /actionpack/lib | |
| parent | bf3ddfa28da8ca837ddce8c6744a6c1fd9a51243 (diff) | |
| parent | 14e697cf2a1f2a4d223463839f6748fca4658bcf (diff) | |
| download | rails-26306420a6f483f23172d84176bf6aa57548651f.tar.gz rails-26306420a6f483f23172d84176bf6aa57548651f.tar.bz2 rails-26306420a6f483f23172d84176bf6aa57548651f.zip | |
Merge branch 'master' into adequaterecord
* master:
modify model generator warning message. refs [#174c9f0]
Replace "data store" with database [ci skip]
Return a hash rather than array from fetch_multi
Fix concerning module reference [ci skip]
Fixes docs typo in nested resource path helpers [skip ci]
Fix some validators when used on model instance
Pass strings to demodulize method
pass strings to the underscore method
speed up `underscore` in cases that don't need to do anything
pass the class name to `tableize`
[ci skip] Update list of files extensions in rake notes guide
Fix controller test not resetting @_url_options
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/metal/testing.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/testing.rb b/actionpack/lib/action_controller/metal/testing.rb index 0377b8c4cf..dd8da4b5dc 100644 --- a/actionpack/lib/action_controller/metal/testing.rb +++ b/actionpack/lib/action_controller/metal/testing.rb @@ -17,7 +17,6 @@ module ActionController def recycle! @_url_options = nil - self.response_body = nil self.formats = nil self.params = nil end diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index cf11ce1a9b..8650b75400 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -568,6 +568,7 @@ module ActionController name = @request.parameters[:action] + @controller.recycle! @controller.process(name) if cookies = @request.env['action_dispatch.cookies'] |