2 files changed, 24 insertions, 27 deletions
diff --git a/actioncable/test/javascript/src/unit/action_cable_test.coffee b/actioncable/test/javascript/src/unit/action_cable_test.coffee
index f9eff64769..3944f3a7f6 100644
--- a/actioncable/test/javascript/src/unit/action_cable_test.coffee
+++ b/actioncable/test/javascript/src/unit/action_cable_test.coffee
@@ -2,6 +2,23 @@
 {testURL} = ActionCable.TestHelpers
 
 module "ActionCable", ->
+  module "Adapters", ->
+    module "WebSocket", ->
+      test "default is window.WebSocket", (assert) ->
+        assert.equal ActionCable.WebSocket, window.WebSocket
+
+      test "configurable", (assert) ->
+        ActionCable.WebSocket = ""
+        assert.equal ActionCable.WebSocket, ""
+
+    module "logger", ->
+      test "default is window.console", (assert) ->
+        assert.equal ActionCable.logger, window.console
+
+      test "configurable", (assert) ->
+        ActionCable.logger = ""
+        assert.equal ActionCable.logger, ""
+
   module "#createConsumer", ->
     test "uses specified URL", (assert) ->
       consumer = ActionCable.createConsumer(testURL)
diff --git a/actioncable/test/javascript/src/unit/consumer_test.coffee b/actioncable/test/javascript/src/unit/consumer_test.coffee
index d8b1450ad8..cf8a592255 100644
--- a/actioncable/test/javascript/src/unit/consumer_test.coffee
+++ b/actioncable/test/javascript/src/unit/consumer_test.coffee
@@ -1,31 +1,11 @@
 {module, test} = QUnit
-{testURL, createConsumer} = ActionCable.TestHelpers
+{consumerTest} = ActionCable.TestHelpers
 
 module "ActionCable.Consumer", ->
-  test "#connect", (assert) ->
-    done = assert.async()
+  consumerTest "#connect", connect: false, ({consumer, server, done}) ->
+    server.on("connection", done)
+    consumer.connect()
 
-    createConsumer testURL, (consumer, server) ->
-      server.on "connection", ->
-        clients = server.clients()
-        assert.equal clients.length, 1
-        assert.equal clients[0].readyState, WebSocket.OPEN
-        done()
-
-      consumer.connect()
-
-  test "#disconnect", (assert) ->
-    done = assert.async()
-
-    createConsumer testURL, (consumer, server) ->
-      server.on "connection", ->
-        clients = server.clients()
-        assert.equal clients.length, 1
-
-        clients[0].addEventListener "close", (event) ->
-          assert.equal event.type, "close"
-          done()
-
-        consumer.disconnect()
-
-      consumer.connect()
+  consumerTest "#disconnect", ({consumer, client, done}) ->
+    client.addEventListener("close", done)
+    consumer.disconnect()