diff options
author | Matthew Draper <matthew@trebex.net> | 2016-10-01 10:57:26 +0930 |
---|---|---|
committer | Matthew Draper <matthew@trebex.net> | 2016-10-01 15:35:59 +0930 |
commit | d44177d45e59ece7c2b8ed37bd2bfc23d28d7b22 (patch) | |
tree | 498ec595119ad2f9037e7d29c85e39ac51f43f12 /actioncable/test/test_helper.rb | |
parent | 9588a3d66d4ca6ba122d32417aa62680f441bf40 (diff) | |
download | rails-d44177d45e59ece7c2b8ed37bd2bfc23d28d7b22.tar.gz rails-d44177d45e59ece7c2b8ed37bd2bfc23d28d7b22.tar.bz2 rails-d44177d45e59ece7c2b8ed37bd2bfc23d28d7b22.zip |
Remove Faye mode
No deprecation, because it was never documented.
Diffstat (limited to 'actioncable/test/test_helper.rb')
-rw-r--r-- | actioncable/test/test_helper.rb | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/actioncable/test/test_helper.rb b/actioncable/test/test_helper.rb index af3c7eee1d..a47032753b 100644 --- a/actioncable/test/test_helper.rb +++ b/actioncable/test/test_helper.rb @@ -13,41 +13,7 @@ end # Require all the stubs and models Dir[File.dirname(__FILE__) + "/stubs/*.rb"].each { |file| require file } -if ENV["FAYE"].present? - require "faye/websocket" - class << Faye::WebSocket - remove_method :ensure_reactor_running - - # 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 EM loop in tests to make things simpler. - def ensure_reactor_running - # no-op - end - end -end - -module EventMachineConcurrencyHelpers - def wait_for_async - EM.run_deferred_callbacks - end - - def run_in_eventmachine - failure = nil - EM.run do - begin - yield - rescue => ex - failure = ex - ensure - wait_for_async - EM.stop if EM.reactor_running? - end - end - raise failure if failure - end -end - -module ConcurrentRubyConcurrencyHelpers +class ActionCable::TestCase < ActiveSupport::TestCase def wait_for_async wait_for_executor Concurrent.global_io_executor end @@ -56,14 +22,6 @@ module ConcurrentRubyConcurrencyHelpers yield wait_for_async end -end - -class ActionCable::TestCase < ActiveSupport::TestCase - if ENV["FAYE"].present? - include EventMachineConcurrencyHelpers - else - include ConcurrentRubyConcurrencyHelpers - end def wait_for_executor(executor) # do not wait forever, wait 2s |