diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-28 10:33:27 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-28 10:33:27 -0700 |
| commit | 4d87c4e2f9b407f3cc7a8d2e53c2cdbcf41ae30f (patch) | |
| tree | 51e50976982415462a35f646de8adff54251cc9a | |
| parent | ab0359c4ae7049eb8262c212c520cb8966e7392c (diff) | |
| parent | 8b6301adbc8ceba9b796cf1748aac973aebcee46 (diff) | |
| download | rails-4d87c4e2f9b407f3cc7a8d2e53c2cdbcf41ae30f.tar.gz rails-4d87c4e2f9b407f3cc7a8d2e53c2cdbcf41ae30f.tar.bz2 rails-4d87c4e2f9b407f3cc7a8d2e53c2cdbcf41ae30f.zip | |
Merge pull request #7186 from rimidl/fix-failure-test-in-actionpack
Fix test_can_wait_until_commit(ResponseTest) in /actionpack/test/dispatch/response_test.rb
| -rw-r--r-- | actionpack/test/dispatch/response_test.rb | 4 |
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 |