aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/test/dispatch/response_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 500056b56b..51948a623c 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -7,11 +7,11 @@ class ResponseTest < ActiveSupport::TestCase
def test_can_wait_until_commit
t = Thread.new {
- assert @response.await_commit
+ @response.await_commit
}
@response.commit!
assert @response.committed?
- t.join
+ assert t.join(0.5)
end
def test_response_body_encoding