Permalink
Browse files

Remove useless || operation

  • Loading branch information...
1 parent 6bab1b4 commit ee314a5e5aa2b29978b78fbe1b272bcfff865d4a @carlosantoniodasilva carlosantoniodasilva committed Jan 17, 2013
Showing with 2 additions and 3 deletions.
  1. +1 −2 actionpack/lib/action_controller/test_case.rb
  2. +1 −1 actionpack/test/controller/layout_test.rb
@@ -81,8 +81,7 @@ def process(*args)
# # assert that the "_customer" partial was rendered with a specific object
# assert_template partial: '_customer', locals: { customer: @customer }
def assert_template(options = {}, message = nil)
- # Force body to be read in case the
- # template is being streamed
+ # Force body to be read in case the template is being streamed.
response.body
case options
@@ -80,7 +80,7 @@ class DefaultLayoutController < LayoutTest
class StreamingLayoutController < LayoutTest
def render(*args)
- options = args.extract_options! || {}
+ options = args.extract_options!
super(*args, options.merge(:stream => true))
end
end

0 comments on commit ee314a5

Please sign in to comment.