aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-30 22:55:43 -0800
committerJosé Valim <jose.valim@gmail.com>2011-12-30 22:55:43 -0800
commit226528dfccb363b8d9007cc31ba87560565b530d (patch)
tree7e645d804f9c24a056f50897f91b5d18bff949df /actionpack
parented17983ec56dec689a0311c7f8fcbeba9874e5a4 (diff)
parent8fbb44787e50545e427819a41695a4afa7e67584 (diff)
downloadrails-226528dfccb363b8d9007cc31ba87560565b530d.tar.gz
rails-226528dfccb363b8d9007cc31ba87560565b530d.tar.bz2
rails-226528dfccb363b8d9007cc31ba87560565b530d.zip
Merge pull request #4241 from castlerock/remove_more_conditions_for_Fiber_ruby19
remove more conditions for Fiber in ruby19
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/new_base/render_streaming_test.rb2
-rw-r--r--actionpack/test/template/streaming_render_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index 1a17e24914..1532bd5c98 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -111,4 +111,4 @@ module RenderStreaming
assert_equal cache, headers["Cache-Control"]
end
end
-end if defined?(Fiber)
+end
diff --git a/actionpack/test/template/streaming_render_test.rb b/actionpack/test/template/streaming_render_test.rb
index 4d01352b43..520bf3a824 100644
--- a/actionpack/test/template/streaming_render_test.rb
+++ b/actionpack/test/template/streaming_render_test.rb
@@ -106,4 +106,4 @@ class FiberedTest < ActiveSupport::TestCase
buffered_render(:template => "test/nested_streaming", :layout => "layouts/streaming")
end
-end if defined?(Fiber)
+end