From 27a04a61ca715090374b2dfde3a2691f1a5fe7e4 Mon Sep 17 00:00:00 2001
From: Florian Eitel <feitel@indeedgeek.de>
Date: Mon, 25 Nov 2019 12:04:50 +0100
Subject: [PATCH] test: fix tests for createSocketUrl (#2323)

---
 client-src/default/utils/createSocketUrl.js   |  8 ++------
 .../createSocketUrl.test.js.snap              | 20 +++++++++----------
 test/client/utils/createSocketUrl.test.js     |  3 ++-
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/client-src/default/utils/createSocketUrl.js b/client-src/default/utils/createSocketUrl.js
index b7bf6c944d..e55e6b4a4e 100644
--- a/client-src/default/utils/createSocketUrl.js
+++ b/client-src/default/utils/createSocketUrl.js
@@ -11,15 +11,11 @@ function createSocketUrl(resourceQuery) {
 
   if (typeof resourceQuery === 'string' && resourceQuery !== '') {
     // If this bundle is inlined, use the resource query to get the correct url.
+    // strip leading `?` from query string
     urlParts = url.parse(resourceQuery.substr(1));
   } else {
     // Else, get the url from the <script> this file was called with.
-    let scriptHost = getCurrentScriptSource();
-
-    if (scriptHost) {
-      // eslint-disable-next-line no-useless-escape
-      scriptHost = scriptHost.replace(/\/[^\/]+$/, '');
-    }
+    const scriptHost = getCurrentScriptSource();
     urlParts = url.parse(scriptHost || '/', false, true);
   }
 
diff --git a/test/client/utils/__snapshots__/createSocketUrl.test.js.snap b/test/client/utils/__snapshots__/createSocketUrl.test.js.snap
index 639b1588e2..acf777a471 100644
--- a/test/client/utils/__snapshots__/createSocketUrl.test.js.snap
+++ b/test/client/utils/__snapshots__/createSocketUrl.test.js.snap
@@ -4,34 +4,34 @@ exports[`createSocketUrl should return the url when __resourceQuery is ?test 1`]
 
 exports[`createSocketUrl should return the url when __resourceQuery is http://0.0.0.0 1`] = `"http://localhost/sockjs-node"`;
 
-exports[`createSocketUrl should return the url when __resourceQuery is http://user:pass@[::]:8080 1`] = `"ttp:user:pass@localhost:8080/sockjs-node"`;
+exports[`createSocketUrl should return the url when __resourceQuery is http://user:pass@[::]:8080 1`] = `"http://user:pass@localhost:8080/sockjs-node"`;
 
-exports[`createSocketUrl should return the url when __resourceQuery is http://user:password@localhost/ 1`] = `"ttp:user:password@localhost/sockjs-node"`;
+exports[`createSocketUrl should return the url when __resourceQuery is http://user:password@localhost/ 1`] = `"http://user:password@localhost/sockjs-node"`;
 
-exports[`createSocketUrl should return the url when __resourceQuery is https://example.com 1`] = `"ttps:example.com/sockjs-node"`;
+exports[`createSocketUrl should return the url when __resourceQuery is https://example.com 1`] = `"https://example.com/sockjs-node"`;
 
-exports[`createSocketUrl should return the url when __resourceQuery is https://example.com/path 1`] = `"ttps:example.com/sockjs-node"`;
+exports[`createSocketUrl should return the url when __resourceQuery is https://example.com/path 1`] = `"https://example.com/sockjs-node"`;
 
-exports[`createSocketUrl should return the url when __resourceQuery is https://example.com/path/foo.js 1`] = `"ttps:example.com/sockjs-node"`;
+exports[`createSocketUrl should return the url when __resourceQuery is https://example.com/path/foo.js 1`] = `"https://example.com/sockjs-node"`;
 
-exports[`createSocketUrl should return the url when __resourceQuery is https://localhost:123 1`] = `"ttps:localhost:123/sockjs-node"`;
+exports[`createSocketUrl should return the url when __resourceQuery is https://localhost:123 1`] = `"https://localhost:123/sockjs-node"`;
 
 exports[`createSocketUrl should return the url when __resourceQuery is undefined 1`] = `"/sockjs-node"`;
 
 exports[`createSocketUrl should return the url when the current script source is ?test 1`] = `"/sockjs-node"`;
 
-exports[`createSocketUrl should return the url when the current script source is http://0.0.0.0 1`] = `"http:/sockjs-node"`;
+exports[`createSocketUrl should return the url when the current script source is http://0.0.0.0 1`] = `"http://localhost/sockjs-node"`;
 
-exports[`createSocketUrl should return the url when the current script source is http://user:pass@[::]:8080 1`] = `"http:/sockjs-node"`;
+exports[`createSocketUrl should return the url when the current script source is http://user:pass@[::]:8080 1`] = `"http://user:pass@localhost:8080/sockjs-node"`;
 
 exports[`createSocketUrl should return the url when the current script source is http://user:password@localhost/ 1`] = `"http://user:password@localhost/sockjs-node"`;
 
-exports[`createSocketUrl should return the url when the current script source is https://example.com 1`] = `"https:/sockjs-node"`;
+exports[`createSocketUrl should return the url when the current script source is https://example.com 1`] = `"https://example.com/sockjs-node"`;
 
 exports[`createSocketUrl should return the url when the current script source is https://example.com/path 1`] = `"https://example.com/sockjs-node"`;
 
 exports[`createSocketUrl should return the url when the current script source is https://example.com/path/foo.js 1`] = `"https://example.com/sockjs-node"`;
 
-exports[`createSocketUrl should return the url when the current script source is https://localhost:123 1`] = `"https:/sockjs-node"`;
+exports[`createSocketUrl should return the url when the current script source is https://localhost:123 1`] = `"https://localhost:123/sockjs-node"`;
 
 exports[`createSocketUrl should return the url when the current script source is undefined 1`] = `"/sockjs-node"`;
diff --git a/test/client/utils/createSocketUrl.test.js b/test/client/utils/createSocketUrl.test.js
index e865ada8ee..d39f7d21cc 100644
--- a/test/client/utils/createSocketUrl.test.js
+++ b/test/client/utils/createSocketUrl.test.js
@@ -26,7 +26,8 @@ describe('createSocketUrl', () => {
     const createSocketUrl = require('../../../client-src/default/utils/createSocketUrl');
 
     test(`should return the url when __resourceQuery is ${url}`, () => {
-      expect(createSocketUrl(url)).toMatchSnapshot();
+      const query = url ? url.querystring : url;
+      expect(createSocketUrl(query)).toMatchSnapshot();
     });
 
     test(`should return the url when the current script source is ${url}`, () => {