Add more Action Cable JavaScript tests

4 files changed, 78 insertions, 0 deletions

diff --git a/actioncable/test/javascript/src/test_helpers/consumer_test_helper.coffee b/actioncable/test/javascript/src/test_helpers/consumer_test_helper.coffee
index 6b145dede8..a9e95c37f0 100644
--- a/actioncable/test/javascript/src/test_helpers/consumer_test_helper.coffee
+++ b/actioncable/test/javascript/src/test_helpers/consumer_test_helper.coffee
@@ -21,6 +21,16 @@ TestHelpers.consumerTest = (name, options = {}, callback) ->
       assert.equal clients.length, 1
       assert.equal clients[0].readyState, WebSocket.OPEN
 
+    server.broadcastTo = (subscription, data = {}, callback) ->
+      data.identifier = subscription.identifier
+
+      if data.message_type
+        data.type = ActionCable.INTERNAL.message_types[data.message_type]
+        delete data.message_type
+
+      server.send(JSON.stringify(data))
+      TestHelpers.defer(callback)
+
     done = ->
       consumer.disconnect()
       server.close()
diff --git a/actioncable/test/javascript/src/test_helpers/index.coffee b/actioncable/test/javascript/src/test_helpers/index.coffee
index d36524d9cc..c84cbbcb2c 100644
--- a/actioncable/test/javascript/src/test_helpers/index.coffee
+++ b/actioncable/test/javascript/src/test_helpers/index.coffee
@@ -4,5 +4,8 @@
 ActionCable.TestHelpers =
   testURL: "ws://cable.example.com/"
 
+  defer: (callback) ->
+    setTimeout(callback, 1)
+
 originalWebSocket = ActionCable.WebSocket
 QUnit.testDone -> ActionCable.WebSocket = originalWebSocket
diff --git a/actioncable/test/javascript/src/unit/subscription_test.coffee b/actioncable/test/javascript/src/unit/subscription_test.coffee
new file mode 100644
index 0000000000..07027ed170
--- /dev/null
+++ b/actioncable/test/javascript/src/unit/subscription_test.coffee
@@ -0,0 +1,40 @@
+{module, test} = QUnit
+{consumerTest} = ActionCable.TestHelpers
+
+module "ActionCable.Subscription", ->
+  consumerTest "#initialized callback", ({server, consumer, assert, done}) ->
+    consumer.subscriptions.create "chat",
+      initialized: ->
+        assert.ok true
+        done()
+
+  consumerTest "#connected callback", ({server, consumer, assert, done}) ->
+    subscription = consumer.subscriptions.create "chat",
+      connected: ->
+        assert.ok true
+        done()
+
+    server.broadcastTo(subscription, message_type: "confirmation")
+
+  consumerTest "#disconnected callback", ({server, consumer, assert, done}) ->
+    subscription = consumer.subscriptions.create "chat",
+      disconnected: ->
+        assert.ok true
+        done()
+
+    server.broadcastTo subscription, message_type: "confirmation", ->
+      server.close()
+
+  consumerTest "#perform", ({consumer, server, assert, done}) ->
+    subscription = consumer.subscriptions.create "chat",
+      connected: ->
+        @perform(publish: "hi")
+
+    server.on "message", (message) ->
+      data = JSON.parse(message)
+      assert.equal data.identifier, subscription.identifier
+      assert.equal data.command, "message"
+      assert.deepEqual data.data, JSON.stringify(action: { publish: "hi" })
+      done()
+
+    server.broadcastTo(subscription, message_type: "confirmation")
diff --git a/actioncable/test/javascript/src/unit/subscriptions_test.coffee b/actioncable/test/javascript/src/unit/subscriptions_test.coffee
new file mode 100644
index 0000000000..170b370e4a
--- /dev/null
+++ b/actioncable/test/javascript/src/unit/subscriptions_test.coffee
@@ -0,0 +1,25 @@
+{module, test} = QUnit
+{consumerTest} = ActionCable.TestHelpers
+
+module "ActionCable.Subscriptions", ->
+  consumerTest "create subscription with channel string", ({consumer, server, assert, done}) ->
+    channel = "chat"
+
+    server.on "message", (message) ->
+      data = JSON.parse(message)
+      assert.equal data.command, "subscribe"
+      assert.equal data.identifier, JSON.stringify({channel})
+      done()
+
+    consumer.subscriptions.create(channel)
+
+  consumerTest "create subscription with channel object", ({consumer, server, assert, done}) ->
+    channel = channel: "chat", room: "action"
+
+    server.on "message", (message) ->
+      data = JSON.parse(message)
+      assert.equal data.command, "subscribe"
+      assert.equal data.identifier, JSON.stringify(channel)
+      done()
+
+    consumer.subscriptions.create(channel)