5 files changed, 42 insertions, 5 deletions
diff --git a/actioncable/README.md b/actioncable/README.md
index 28e2602cbf..a0b7412dd4 100644
--- a/actioncable/README.md
+++ b/actioncable/README.md
@@ -167,7 +167,7 @@ App.cable.subscriptions.create "AppearanceChannel",
   buttonSelector = "[data-behavior~=appear_away]"
 
   install: ->
-    $(document).on "page:change.appearance", =>
+    $(document).on "turbolinks:load.appearance", =>
       @appear()
 
     $(document).on "click.appearance", buttonSelector, =>
diff --git a/actioncable/lib/action_cable/server/base.rb b/actioncable/lib/action_cable/server/base.rb
index 67ada7cc2e..419eccd73c 100644
--- a/actioncable/lib/action_cable/server/base.rb
+++ b/actioncable/lib/action_cable/server/base.rb
@@ -37,9 +37,13 @@ module ActionCable
         connections.each(&:close)
 
         @mutex.synchronize do
-          worker_pool.halt if @worker_pool
-
+          # Shutdown the worker pool
+          @worker_pool.halt if @worker_pool
           @worker_pool = nil
+
+          # Shutdown the pub/sub adapter
+          @pubsub.shutdown if @pubsub
+          @pubsub = nil
         end
       end
 
diff --git a/actioncable/lib/action_cable/server/worker.rb b/actioncable/lib/action_cable/server/worker.rb
index 7460472551..43639c27af 100644
--- a/actioncable/lib/action_cable/server/worker.rb
+++ b/actioncable/lib/action_cable/server/worker.rb
@@ -25,7 +25,7 @@ module ActionCable
       # Stop processing work: any work that has not already started
       # running will be discarded from the queue
       def halt
-        @executor.kill
+        @executor.shutdown
       end
 
       def stopping?
diff --git a/actioncable/test/server/base_test.rb b/actioncable/test/server/base_test.rb
new file mode 100644
index 0000000000..f0a51c5a7d
--- /dev/null
+++ b/actioncable/test/server/base_test.rb
@@ -0,0 +1,33 @@
+require "test_helper"
+require "stubs/test_server"
+require "active_support/core_ext/hash/indifferent_access"
+
+class BaseTest < ActiveSupport::TestCase
+  def setup
+    @server = ActionCable::Server::Base.new
+    @server.config.cable = { adapter: "async" }.with_indifferent_access
+  end
+
+  class FakeConnection
+    def close
+    end
+  end
+
+  test "#restart closes all open connections" do
+    conn = FakeConnection.new
+    @server.add_connection(conn)
+
+    conn.expects(:close)
+    @server.restart
+  end
+
+  test "#restart shuts down worker pool" do
+    @server.worker_pool.expects(:halt)
+    @server.restart
+  end
+
+  test "#restart shuts down pub/sub adapter" do
+    @server.pubsub.expects(:shutdown)
+    @server.restart
+  end
+end
diff --git a/actioncable/test/subscription_adapter/common.rb b/actioncable/test/subscription_adapter/common.rb
index 8cf0b5c684..3aa88c2caa 100644
--- a/actioncable/test/subscription_adapter/common.rb
+++ b/actioncable/test/subscription_adapter/common.rb
@@ -20,7 +20,7 @@ module CommonSubscriptionAdapterTest
   end
 
   def teardown
-    [@rx_adapter, @tx_adapter].uniq.each(&:shutdown)
+    [@rx_adapter, @tx_adapter].uniq.compact.each(&:shutdown)
   end
 
   def subscribe_as_queue(channel, adapter = @rx_adapter)