diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-17 09:20:02 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-01-17 09:28:07 -0200 |
| commit | ee314a5e5aa2b29978b78fbe1b272bcfff865d4a (patch) | |
| tree | deabd4c0809543d9f4660972bdfa1a1e99eb3c36 | |
| parent | 6bab1b4d86baf061638df6edd8964295f37ed798 (diff) | |
| download | rails-ee314a5e5aa2b29978b78fbe1b272bcfff865d4a.tar.gz rails-ee314a5e5aa2b29978b78fbe1b272bcfff865d4a.tar.bz2 rails-ee314a5e5aa2b29978b78fbe1b272bcfff865d4a.zip | |
Remove useless || operation
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 3 | ||||
| -rw-r--r-- | actionpack/test/controller/layout_test.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 331d15d403..d8206b573d 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -81,8 +81,7 @@ module ActionController # # 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 diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb index 94a8d2f180..365fa04570 100644 --- a/actionpack/test/controller/layout_test.rb +++ b/actionpack/test/controller/layout_test.rb @@ -80,7 +80,7 @@ end class StreamingLayoutController < LayoutTest def render(*args) - options = args.extract_options! || {} + options = args.extract_options! super(*args, options.merge(:stream => true)) end end |