1 files changed, 4 insertions, 3 deletions
diff --git a/actioncable/app/assets/javascripts/action_cable.js b/actioncable/app/assets/javascripts/action_cable.js
index 280adbfa83..4efab2ed46 100644
--- a/actioncable/app/assets/javascripts/action_cable.js
+++ b/actioncable/app/assets/javascripts/action_cable.js
@@ -465,14 +465,15 @@
     }
   }
   function createWebSocketURL(url) {
-    if (url && !/^wss?:/i.test(url)) {
+    var webSocketURL = typeof url === "function" ? url() : url;
+    if (webSocketURL && !/^wss?:/i.test(webSocketURL)) {
       var a = document.createElement("a");
-      a.href = url;
+      a.href = webSocketURL;
       a.href = a.href;
       a.protocol = a.protocol.replace("http", "ws");
       return a.href;
     } else {
-      return url;
+      return webSocketURL;
     }
   }
   exports.Connection = Connection;