diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-05-22 18:40:26 +0200 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-05-22 19:01:52 +0200 |
| commit | 9d08f86cd45ed939ecf2e24e81655371910c8045 (patch) | |
| tree | fd29fc131279e8633921804a593fa80df0e695d2 /actionpack/lib | |
| parent | d1d9a6c26113cf4a0decb504c46e4e7fe4351ce6 (diff) | |
| download | rails-9d08f86cd45ed939ecf2e24e81655371910c8045.tar.gz rails-9d08f86cd45ed939ecf2e24e81655371910c8045.tar.bz2 rails-9d08f86cd45ed939ecf2e24e81655371910c8045.zip | |
Make assertion tests pass with the new base
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/testing/process2.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_view/test_case.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/testing/process2.rb b/actionpack/lib/action_controller/testing/process2.rb index bee82c280e..677dd41781 100644 --- a/actionpack/lib/action_controller/testing/process2.rb +++ b/actionpack/lib/action_controller/testing/process2.rb @@ -41,6 +41,7 @@ module ActionController @response.recycle! @controller.response_body = nil @controller.formats = nil + @controller.params = nil @html_document = nil @request.env['REQUEST_METHOD'] = http_method diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb index 22adf97304..7355af4192 100644 --- a/actionpack/lib/action_view/test_case.rb +++ b/actionpack/lib/action_view/test_case.rb @@ -11,7 +11,7 @@ module ActionView attr_internal :rendered alias_method :_render_template_without_template_tracking, :_render_template def _render_template(template, local_assigns = {}) - if template.respond_to?(:identifier) + if template.respond_to?(:identifier) && template.present? @_rendered[:partials][template] += 1 if template.partial? @_rendered[:template] ||= [] @_rendered[:template] << template |