Related to: JENKINS-36829 - empty rootURL causes an error with sse (#6)

jenkinsci · Aug 25, 2016 · ca1826b · ca1826b
1 parent f012d51
commit ca1826b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/main/js/sse-client.js b/src/main/js/sse-client.js
@@ -73,12 +73,13 @@ function scheduleDoConfigure(delay) {
 }
 function discoverJenkinsUrl() {
     jenkinsUrl = jsModules.getRootURL();
-
-    if (!jenkinsUrl || jenkinsUrl.length < 1) {
-        throw new Error('Invalid jenkinsUrl argument ' + jenkinsUrl);
-    }
-    if (jenkinsUrl.charAt(jenkinsUrl.length - 1) !== '/') {
-        jenkinsUrl += '/';
+    if (!jenkinsUrl) {
+        jenkinsUrl = '';
+    } else {
+        // only in tests, this is suffixed ...
+        while (jenkinsUrl.charAt(jenkinsUrl.length - 1) === '/') {
+            jenkinsUrl = jenkinsUrl.substring(0, jenkinsUrl.length - 1);
+        }
     }
 }
 
@@ -141,11 +142,10 @@ exports.connect = function (clientId, onConnect) {
         // TODO: Need to add browser poly-fills for stuff like this
         // See https://github.com/remy/polyfills/blob/master/EventSource.js
     } else {
-        var connectUrl = jenkinsUrl + 'sse-gateway/connect?clientId='
+        var connectUrl = jenkinsUrl + '/sse-gateway/connect?clientId='
                                     + encodeURIComponent(clientId);
-
         ajax.get(connectUrl, function (response) {
-            var listenUrl = jenkinsUrl + 'sse-gateway/listen/' + encodeURIComponent(clientId);
+            var listenUrl = jenkinsUrl + '/sse-gateway/listen/' + encodeURIComponent(clientId);
 
             if (configuration.sendSessionId) {
                 // Sending the jsessionid helps headless clients to maintain
@@ -385,7 +385,7 @@ function doConfigure() {
         // open the SSE channel + send the jenkins session info.
         scheduleDoConfigure(100);
     } else {
-        var configureUrl = jenkinsUrl + 'sse-gateway/configure?batchId=' + configurationBatchId;
+        var configureUrl = jenkinsUrl + '/sse-gateway/configure?batchId=' + configurationBatchId;
 
         LOGGER.debug('Sending notification configuration request for configuration batch '
             + configurationBatchId + '.', configurationQueue);

diff --git a/src/test/js/sse-plugin-no-filter-ispec.js b/src/test/js/sse-plugin-no-filter-ispec.js
@@ -16,7 +16,7 @@ describe("sse plugin integration tests - subscribe and unsubscribe - no filters"
 
             function runBuild() {
                 var ajax = jsTest.requireSrcModule('ajax');
-                ajax.post(undefined, sseClient.jenkinsUrl + 'job/sse-gateway-test-job/build', jenkinsSessionInfo);
+                ajax.post(undefined, sseClient.jenkinsUrl + '/job/sse-gateway-test-job/build', jenkinsSessionInfo);
             }
 
             sseClient.connect('sse-client-123', function(jenkinsSession) {

diff --git a/src/test/js/sse-plugin-with-filter-ispec.js b/src/test/js/sse-plugin-with-filter-ispec.js
@@ -16,7 +16,7 @@ describe("sse plugin integration tests - with filters", function () {
                 var ajax = jsTest.requireSrcModule('ajax');
 
                 // Once connected to the SSE Gateway, fire off a build of the sample job
-                ajax.post(undefined, sseClient.jenkinsUrl + 'job/sse-gateway-test-job/build', jenkinsSessionInfo);
+                ajax.post(undefined, sseClient.jenkinsUrl + '/job/sse-gateway-test-job/build', jenkinsSessionInfo);
 
                 sseClient.subscribe('job', function () {
                     expect('Should not have received this event').toBe();