aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-01-13 18:40:34 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2012-01-13 19:46:13 -0200
commit29fdd8c7779ec2ba74cfb742e8fcef47bfae6c09 (patch)
tree6b3e2d17d08928eea7e7cf7c478610ea18f5d262 /actionpack/test/dispatch
parent161c857b9b9adce4d6fe0145120805b78d3d4c65 (diff)
downloadrails-29fdd8c7779ec2ba74cfb742e8fcef47bfae6c09.tar.gz
rails-29fdd8c7779ec2ba74cfb742e8fcef47bfae6c09.tar.bz2
rails-29fdd8c7779ec2ba74cfb742e8fcef47bfae6c09.zip
Use a BodyProxy instead of including a Module that responds to close.
Closes #4441 if Active Record is disabled assets are delivered correctly
Diffstat (limited to 'actionpack/test/dispatch')
-rw-r--r--actionpack/test/dispatch/reloader_test.rb13
1 files changed, 12 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/reloader_test.rb b/actionpack/test/dispatch/reloader_test.rb
index e371c3b0c1..ce9ccfcee8 100644
--- a/actionpack/test/dispatch/reloader_test.rb
+++ b/actionpack/test/dispatch/reloader_test.rb
@@ -43,6 +43,16 @@ class ReloaderTest < ActiveSupport::TestCase
assert_respond_to body, :close
end
+ def test_returned_body_object_always_responds_to_close_even_if_called_twice
+ body = call_and_return_body
+ assert_respond_to body, :close
+ body.close
+
+ body = call_and_return_body
+ assert_respond_to body, :close
+ body.close
+ end
+
def test_condition_specifies_when_to_reload
i, j = 0, 0, 0, 0
Reloader.to_prepare { |*args| i += 1 }
@@ -154,7 +164,8 @@ class ReloaderTest < ActiveSupport::TestCase
private
def call_and_return_body(&block)
- @reloader ||= Reloader.new(block || proc {[200, {}, 'response']})
+ @response ||= 'response'
+ @reloader ||= Reloader.new(block || proc {[200, {}, @response]})
@reloader.call({'rack.input' => StringIO.new('')})[2]
end
end