aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJeremy Daer <jeremydaer@gmail.com>2015-10-16 09:11:45 -0700
committerJeremy Daer <jeremydaer@gmail.com>2015-10-16 09:11:45 -0700
commit9a8824fb5ebf6529b3f4f94df4da7b6071d03c5d (patch)
tree559b76da51f92ae503f2145d5b6dbed6e74e7f0c /test
parentacfdcf556888a88dc2d2026553d585f920fae105 (diff)
parent5efd82dbe5307982c1eac3ada7a2478993fd59be (diff)
downloadrails-9a8824fb5ebf6529b3f4f94df4da7b6071d03c5d.tar.gz
rails-9a8824fb5ebf6529b3f4f94df4da7b6071d03c5d.tar.bz2
rails-9a8824fb5ebf6529b3f4f94df4da7b6071d03c5d.zip
Merge pull request #97 from lsylvester/speed-up-tests
Speed up tests be calling EM.run_deferred_callbacks instead of setting a timer
Diffstat (limited to 'test')
-rw-r--r--test/test_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 34c7def46b..f8a9971077 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -39,7 +39,8 @@ class ActionCable::TestCase < ActiveSupport::TestCase
EM.run do
yield
- EM::Timer.new(0.1) { EM.stop }
+ EM.run_deferred_callbacks
+ EM.stop
end
end
end