diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-26 15:48:49 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-26 15:48:49 -0800 |
| commit | 8d8ea78a89d56be0eaec6badb79c8f5674f22439 (patch) | |
| tree | 41398a39dafe99fa7f66241b96249825ea1ac130 /actionpack/lib | |
| parent | 59ec4562a2e70df455b2e44a67c340fa5254e26e (diff) | |
| parent | a351149e805910cd980bee1558e56e61c4a82db2 (diff) | |
| download | rails-8d8ea78a89d56be0eaec6badb79c8f5674f22439.tar.gz rails-8d8ea78a89d56be0eaec6badb79c8f5674f22439.tar.bz2 rails-8d8ea78a89d56be0eaec6badb79c8f5674f22439.zip | |
Merge pull request #14105 from twooster/fix-controller-tests
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'] |