1 files changed, 12 insertions, 7 deletions
diff --git a/actioncable/test/test_helper.rb b/actioncable/test/test_helper.rb
index 030362d512..0a9ee7ce77 100644
--- a/actioncable/test/test_helper.rb
+++ b/actioncable/test/test_helper.rb
@@ -2,11 +2,13 @@ require 'action_cable'
 require 'active_support/testing/autorun'
 
 require 'puma'
-
 require 'mocha/setup'
-
 require 'rack/mock'
-require 'active_support/core_ext/hash/indifferent_access'
+
+begin
+  require 'byebug'
+rescue LoadError
+end
 
 # Require all the stubs and models
 Dir[File.dirname(__FILE__) + '/stubs/*.rb'].each {|file| require file }
@@ -47,10 +49,7 @@ end
 
 module ConcurrentRubyConcurrencyHelpers
   def wait_for_async
-    e = Concurrent.global_io_executor
-    until e.completed_task_count == e.scheduled_task_count
-      sleep 0.1
-    end
+    wait_for_executor Concurrent.global_io_executor
   end
 
   def run_in_eventmachine
@@ -65,4 +64,10 @@ class ActionCable::TestCase < ActiveSupport::TestCase
   else
     include ConcurrentRubyConcurrencyHelpers
   end
+
+  def wait_for_executor(executor)
+    until executor.completed_task_count == executor.scheduled_task_count
+      sleep 0.1
+    end
+  end
 end