Skip to content
Browse files

Do not run this streaming test in Ruby 1.8, fix syntax error

  • Loading branch information...
1 parent a5013bb commit 626d0b157f5ccf8a42401e6a111432912331aa47 @carlosantoniodasilva carlosantoniodasilva committed
Showing with 8 additions and 5 deletions.
  1. +8 −5 actionpack/test/controller/layout_test.rb
View
13 actionpack/test/controller/layout_test.rb
@@ -81,7 +81,8 @@ class DefaultLayoutController < LayoutTest
class StreamingLayoutController < LayoutTest
def render(*args)
options = args.extract_options!
- super(*args, options.merge(:stream => true))
+ options[:stream] = true
+ super(*(args << options))
end
end
@@ -129,10 +130,12 @@ def test_layout_set_when_using_default_layout
assert_template :layout => "layouts/layout_test"
end
- def test_layout_set_when_using_streaming_layout
- @controller = StreamingLayoutController.new
- get :hello
- assert_template :hello
+ if RUBY_VERSION >= '1.9'
+ def test_layout_set_when_using_streaming_layout
+ @controller = StreamingLayoutController.new
+ get :hello
+ assert_template :hello
+ end
end
def test_layout_set_when_set_in_controller

0 comments on commit 626d0b1

Please sign in to comment.
Something went wrong with that request. Please try again.