3 files changed, 25 insertions, 3 deletions
diff --git a/actioncable/test/client_test.rb b/actioncable/test/client_test.rb
index be0529bb8b..75545993da 100644
--- a/actioncable/test/client_test.rb
+++ b/actioncable/test/client_test.rb
@@ -127,8 +127,16 @@ class ClientTest < ActionCable::TestCase
       end
 
       @ws.close
+      wait_for_close
+    end
+
+    def wait_for_close
       @closed.wait(WAIT_WHEN_EXPECTING_EVENT)
     end
+
+    def closed?
+      @closed.set?
+    end
   end
 
   def faye_client(port)
@@ -226,4 +234,17 @@ class ClientTest < ActionCable::TestCase
       assert_equal(0, app.connections.count)
     end
   end
+
+  def test_server_restart
+    with_puma_server do |port|
+      c = faye_client(port)
+      assert_equal({"type" => "welcome"}, c.read_message)
+      c.send_message command: 'subscribe', identifier: JSON.dump(channel: 'EchoChannel')
+      assert_equal({"identifier"=>"{\"channel\":\"EchoChannel\"}", "type"=>"confirm_subscription"}, c.read_message)
+
+      ActionCable.server.restart
+      c.wait_for_close
+      assert c.closed?
+    end
+  end
 end
diff --git a/actioncable/test/stubs/test_server.rb b/actioncable/test/stubs/test_server.rb
index 56d132b30a..5916cf1e83 100644
--- a/actioncable/test/stubs/test_server.rb
+++ b/actioncable/test/stubs/test_server.rb
@@ -17,4 +17,8 @@ class TestServer
   def stream_event_loop
     @stream_event_loop ||= ActionCable::Connection::StreamEventLoop.new
   end
+
+  def worker_pool
+    @worker_pool ||= ActionCable::Server::Worker.new(max_size: 5)
+  end
 end
diff --git a/actioncable/test/test_helper.rb b/actioncable/test/test_helper.rb
index 8ddbd4e764..8b157c9b46 100644
--- a/actioncable/test/test_helper.rb
+++ b/actioncable/test/test_helper.rb
@@ -1,9 +1,6 @@
-require File.expand_path('../../../load_paths', __FILE__)
-
 require 'action_cable'
 require 'active_support/testing/autorun'
 
-
 require 'puma'
 
 require 'mocha/setup'