From d03177ffbccb5b30217448d526f1e9aa1fa24297 Mon Sep 17 00:00:00 2001
From: rmacklin <1863540+rmacklin@users.noreply.github.com>
Date: Tue, 2 Apr 2019 14:04:43 -0700
Subject: Simplify ActionCable.createWebSocketURL and realphabetize exports
 (#35810)

* Remove unnecessary variable from ActionCable.createWebSocketURL

* Improve ActionCable test by creating the Consumer before reassigning URL

With this change, the test now actually verifies that the Consumer's url
property changes dynamically (from testURL to `${testURL}foo`).

* Fix alphabetization of ActionCable exports
---
 actioncable/app/assets/javascripts/action_cable.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'actioncable/app/assets/javascripts')

diff --git a/actioncable/app/assets/javascripts/action_cable.js b/actioncable/app/assets/javascripts/action_cable.js
index 029c7567ce..8349361405 100644
--- a/actioncable/app/assets/javascripts/action_cable.js
+++ b/actioncable/app/assets/javascripts/action_cable.js
@@ -477,15 +477,17 @@
     return Consumer;
   }();
   function createWebSocketURL(url) {
-    var webSocketURL = typeof url === "function" ? url() : url;
-    if (webSocketURL && !/^wss?:/i.test(webSocketURL)) {
+    if (typeof url === "function") {
+      url = url();
+    }
+    if (url && !/^wss?:/i.test(url)) {
       var a = document.createElement("a");
-      a.href = webSocketURL;
+      a.href = url;
       a.href = a.href;
       a.protocol = a.protocol.replace("http", "ws");
       return a.href;
     } else {
-      return webSocketURL;
+      return url;
     }
   }
   function createConsumer() {
@@ -505,8 +507,8 @@
   exports.Subscription = Subscription;
   exports.Subscriptions = Subscriptions;
   exports.adapters = adapters;
-  exports.logger = logger;
   exports.createWebSocketURL = createWebSocketURL;
+  exports.logger = logger;
   exports.createConsumer = createConsumer;
   exports.getConfig = getConfig;
   Object.defineProperty(exports, "__esModule", {
-- 
cgit v1.2.3