3 files changed, 16 insertions, 2 deletions
diff --git a/lib/assets/javascripts/cable.coffee b/lib/assets/javascripts/cable.coffee
index 476d90ef72..fca5e095b5 100644
--- a/lib/assets/javascripts/cable.coffee
+++ b/lib/assets/javascripts/cable.coffee
@@ -5,6 +5,7 @@
   PING_IDENTIFIER: "_ping"
   INTERNAL_MESSAGES:
     SUBSCRIPTION_CONFIRMATION: 'confirm_subscription'
+    SUBSCRIPTION_REJECTION: 'reject_subscription'
 
   createConsumer: (url) ->
     new Cable.Consumer url
diff --git a/lib/assets/javascripts/cable/connection.coffee b/lib/assets/javascripts/cable/connection.coffee
index 33159130c7..9de3cc0be4 100644
--- a/lib/assets/javascripts/cable/connection.coffee
+++ b/lib/assets/javascripts/cable/connection.coffee
@@ -58,6 +58,8 @@ class Cable.Connection
         switch type
           when Cable.INTERNAL_MESSAGES.SUBSCRIPTION_CONFIRMATION
             @consumer.subscriptions.notify(identifier, "connected")
+          when Cable.INTERNAL_MESSAGES.SUBSCRIPTION_REJECTION
+            @consumer.subscriptions.rejectSubscription(identifier)
       else
         @consumer.subscriptions.notify(identifier, "received", message)
 
diff --git a/lib/assets/javascripts/cable/subscriptions.coffee b/lib/assets/javascripts/cable/subscriptions.coffee
index 4efb384ee2..497fcb074e 100644
--- a/lib/assets/javascripts/cable/subscriptions.coffee
+++ b/lib/assets/javascripts/cable/subscriptions.coffee
@@ -27,11 +27,22 @@ class Cable.Subscriptions
     for subscription in @subscriptions
       @sendCommand(subscription, "subscribe")
 
+  rejectSubscription: (identifier) ->
+    subscriptions = @findAll(identifier)
+
+    for subscription in subscriptions
+      @removeSubscription(subscription)
+      @notify(subscription, "rejected")
+  
   remove: (subscription) ->
-    @subscriptions = (s for s in @subscriptions when s isnt subscription)
+    @removeSubscription(subscription)
+
     unless @findAll(subscription.identifier).length
       @sendCommand(subscription, "unsubscribe")
 
+  removeSubscription: (subscription) ->
+    @subscriptions = (s for s in @subscriptions when s isnt subscription)
+
   findAll: (identifier) ->
     s for s in @subscriptions when s.identifier is identifier
 
@@ -48,7 +59,7 @@ class Cable.Subscriptions
     for subscription in subscriptions
       subscription[callbackName]?(args...)
 
-      if callbackName in ["initialized", "connected", "disconnected"]
+      if callbackName in ["initialized", "connected", "disconnected", "rejected"]
         {identifier} = subscription
         @record(notification: {identifier, callbackName, args})