6 files changed, 4 insertions, 63 deletions
diff --git a/actioncable/test/client_test.rb b/actioncable/test/client_test.rb
index 2e3821828f..9f97e08f1f 100644
--- a/actioncable/test/client_test.rb
+++ b/actioncable/test/client_test.rb
@@ -39,7 +39,6 @@ class ClientTest < ActionCable::TestCase
     server.config.logger = Logger.new(StringIO.new).tap { |l| l.level = Logger::UNKNOWN }
 
     server.config.cable = ActiveSupport::HashWithIndifferentAccess.new(adapter: "async")
-    server.config.use_faye = ENV["FAYE"].present?
 
     # and now the "real" setup for our test:
     server.config.disable_request_forgery_protection = true
diff --git a/actioncable/test/connection/client_socket_test.rb b/actioncable/test/connection/client_socket_test.rb
index 5043a63370..dff7fefbfb 100644
--- a/actioncable/test/connection/client_socket_test.rb
+++ b/actioncable/test/connection/client_socket_test.rb
@@ -33,8 +33,6 @@ class ActionCable::Connection::ClientSocketTest < ActionCable::TestCase
   end
 
   test "delegate socket errors to on_error handler" do
-    skip if ENV["FAYE"].present?
-
     run_in_eventmachine do
       connection = open_connection
 
@@ -49,8 +47,6 @@ class ActionCable::Connection::ClientSocketTest < ActionCable::TestCase
   end
 
   test "closes hijacked i/o socket at shutdown" do
-    skip if ENV["FAYE"].present?
-
     run_in_eventmachine do
       connection = open_connection
 
diff --git a/actioncable/test/connection/stream_test.rb b/actioncable/test/connection/stream_test.rb
index 4128b32f15..36e1d3c095 100644
--- a/actioncable/test/connection/stream_test.rb
+++ b/actioncable/test/connection/stream_test.rb
@@ -34,8 +34,6 @@ class ActionCable::Connection::StreamTest < ActionCable::TestCase
 
   [ EOFError, Errno::ECONNRESET ].each do |closed_exception|
     test "closes socket on #{closed_exception}" do
-      skip if ENV["FAYE"].present?
-
       run_in_eventmachine do
         connection = open_connection
 
diff --git a/actioncable/test/stubs/test_server.rb b/actioncable/test/stubs/test_server.rb
index 02be72d0cb..4386cdcc70 100644
--- a/actioncable/test/stubs/test_server.rb
+++ b/actioncable/test/stubs/test_server.rb
@@ -10,12 +10,7 @@ class TestServer
     @logger = ActiveSupport::TaggedLogging.new ActiveSupport::Logger.new(StringIO.new)
 
     @config = OpenStruct.new(log_tags: [], subscription_adapter: subscription_adapter)
-    @config.use_faye = ENV["FAYE"].present?
-    @config.client_socket_class = if @config.use_faye
-      ActionCable::Connection::FayeClientSocket
-    else
-      ActionCable::Connection::ClientSocket
-    end
+    @config.client_socket_class = ActionCable::Connection::ClientSocket
 
     @mutex = Monitor.new
   end
@@ -25,12 +20,8 @@ class TestServer
   end
 
   def event_loop
-    @event_loop ||= if @config.use_faye
-      ActionCable::Connection::FayeEventLoop.new
-    else
-      ActionCable::Connection::StreamEventLoop.new.tap do |loop|
-        loop.instance_variable_set(:@executor, Concurrent.global_io_executor)
-      end
+    @event_loop ||= ActionCable::Connection::StreamEventLoop.new.tap do |loop|
+      loop.instance_variable_set(:@executor, Concurrent.global_io_executor)
     end
   end
 
diff --git a/actioncable/test/subscription_adapter/common.rb b/actioncable/test/subscription_adapter/common.rb
index 1538157995..ee62b9c088 100644
--- a/actioncable/test/subscription_adapter/common.rb
+++ b/actioncable/test/subscription_adapter/common.rb
@@ -11,7 +11,6 @@ module CommonSubscriptionAdapterTest
   def setup
     server = ActionCable::Server::Base.new
     server.config.cable = cable_config.with_indifferent_access
-    server.config.use_faye = ENV["FAYE"].present?
 
     adapter_klass = server.config.pubsub_adapter
 
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