3 files changed, 24 insertions, 9 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..b6b99413dc 100644
--- a/lib/assets/javascripts/cable/connection.coffee
+++ b/lib/assets/javascripts/cable/connection.coffee
@@ -55,12 +55,17 @@ class Cable.Connection
       {identifier, message, type} = JSON.parse(event.data)
 
       if type?
-        switch type
-          when Cable.INTERNAL_MESSAGES.SUBSCRIPTION_CONFIRMATION
-            @consumer.subscriptions.notify(identifier, "connected")
+        @handleTypeMessage(type)
       else
         @consumer.subscriptions.notify(identifier, "received", message)
 
+    onTypeMessage: (type) ->
+      switch type
+        when Cable.INTERNAL_MESSAGES.SUBSCRIPTION_CONFIRMATION
+          @consumer.subscriptions.notify(identifier, "connected")
+        when Cable.INTERNAL_MESSAGES.SUBSCRIPTION_REJECTION
+          @consumer.subscriptions.reject(identifier)
+
     open: ->
       @disconnected = false
       @consumer.subscriptions.reload()
diff --git a/lib/assets/javascripts/cable/subscriptions.coffee b/lib/assets/javascripts/cable/subscriptions.coffee
index 4efb384ee2..13db32eb2c 100644
--- a/lib/assets/javascripts/cable/subscriptions.coffee
+++ b/lib/assets/javascripts/cable/subscriptions.coffee
@@ -23,18 +23,27 @@ class Cable.Subscriptions
     @notify(subscription, "initialized")
     @sendCommand(subscription, "subscribe")
 
-  reload: ->
-    for subscription in @subscriptions
-      @sendCommand(subscription, "subscribe")
-
   remove: (subscription) ->
-    @subscriptions = (s for s in @subscriptions when s isnt subscription)
+    @forget(subscription)
+
     unless @findAll(subscription.identifier).length
       @sendCommand(subscription, "unsubscribe")
 
+  reject: (identifier) ->
+    for subscription in @findAll(identifier)
+      @forget(subscription)
+      @notify(subscription, "rejected")
+
+  forget: (subscription) ->
+    @subscriptions = (s for s in @subscriptions when s isnt subscription)
+
   findAll: (identifier) ->
     s for s in @subscriptions when s.identifier is identifier
 
+  reload: ->
+    for subscription in @subscriptions
+      @sendCommand(subscription, "subscribe")
+
   notifyAll: (callbackName, args...) ->
     for subscription in @subscriptions
       @notify(subscription, callbackName, args...)
@@ -48,7 +57,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})