2 files changed, 31 insertions, 13 deletions
diff --git a/actioncable/test/javascript/src/unit/action_cable_test.js b/actioncable/test/javascript/src/unit/action_cable_test.js
index 8847d87545..daad900aca 100644
--- a/actioncable/test/javascript/src/unit/action_cable_test.js
+++ b/actioncable/test/javascript/src/unit/action_cable_test.js
@@ -1,4 +1,4 @@
-import ActionCable from "../../../../app/javascript/action_cable/index"
+import * as ActionCable from "../../../../app/javascript/action_cable/index"
 import {testURL} from "../test_helpers/index"
 
 const {module, test} = QUnit
@@ -7,23 +7,13 @@ 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, "")
+        assert.equal(ActionCable.adapters.WebSocket, window.WebSocket)
       })
     })
 
     module("logger", () => {
       test("default is window.console", assert => {
-        assert.equal(ActionCable.logger, window.console)
-      })
-
-      test("configurable", assert => {
-        ActionCable.logger = ""
-        assert.equal(ActionCable.logger, "")
+        assert.equal(ActionCable.adapters.logger, window.console)
       })
     })
   })
diff --git a/actioncable/test/javascript/src/unit/connection_test.js b/actioncable/test/javascript/src/unit/connection_test.js
new file mode 100644
index 0000000000..9b1a975bfb
--- /dev/null
+++ b/actioncable/test/javascript/src/unit/connection_test.js
@@ -0,0 +1,28 @@
+import * as ActionCable from "../../../../app/javascript/action_cable/index"
+
+const {module, test} = QUnit
+
+module("ActionCable.Connection", () => {
+  module("#getState", () => {
+    test("uses the configured WebSocket adapter", assert => {
+      ActionCable.adapters.WebSocket = { foo: 1, BAR: "42" }
+      const connection = new ActionCable.Connection({})
+      connection.webSocket = {}
+      connection.webSocket.readyState = 1
+      assert.equal(connection.getState(), "foo")
+      connection.webSocket.readyState = "42"
+      assert.equal(connection.getState(), "bar")
+    })
+  })
+
+  module("#open", () => {
+    test("uses the configured WebSocket adapter", assert => {
+      const FakeWebSocket = function() {}
+      ActionCable.adapters.WebSocket = FakeWebSocket
+      const connection = new ActionCable.Connection({})
+      connection.monitor = { start() {} }
+      connection.open()
+      assert.equal(connection.webSocket instanceof FakeWebSocket, true)
+    })
+  })
+})