Run connection tests in EM loop

1 files changed, 18 insertions, 0 deletions

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 5640178f34..39fa98c1f9 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -19,3 +19,21 @@ ActiveSupport.test_order = :sorted
 Dir[File.dirname(__FILE__) + '/stubs/*.rb'].each {|file| require file }
 
 Celluloid.logger = Logger.new(StringIO.new)
+
+class Faye::WebSocket
+  # We don't want Faye to start the EM reactor in tests because it makes testing much harder.
+  # We want to be able to start and stop EW loop in tests to make things simpler.
+  def self.ensure_reactor_running
+    # no-op
+  end
+end
+
+class ActionCable::TestCase < ActiveSupport::TestCase
+  def run_in_eventmachine
+    EM.run do
+      yield
+
+      EM::Timer.new(0.1) { EM.stop }
+    end
+  end
+end