fix: support reconnecting for manually captured browsers

Add "launchdId" (id) to manually captured browsers. This also changes the browser id to be a string rather than a number.
karma-runner · Aug 26, 2013 · a8ac6d2 · a8ac6d2
1 parent 830ce34
commit a8ac6d2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/lib/launcher.js b/lib/launcher.js
@@ -103,7 +103,7 @@ var Launcher = function(emitter, injector) {
 Launcher.$inject = ['emitter', 'injector'];
 
 Launcher.generateId = function() {
-  return Math.floor(Math.random() * 100000000);
+  return '' + Math.floor(Math.random() * 100000000);
 };
 
 

diff --git a/static/karma.src.js b/static/karma.src.js
@@ -50,6 +50,8 @@ var Karma = function(socket, context, navigator, location) {
   var hasError = false;
   var store = {};
   var self = this;
+  var browserId = (location.search.match(/\?id=(.*)/) || [])[1] ||
+      'manual-' + Math.floor(Math.random() * 10000);
 
   var resultsBufferLimit = 1;
   var resultsBuffer = [];
@@ -281,7 +283,7 @@ var Karma = function(socket, context, navigator, location) {
 
     socket.emit('register', {
       name: navigator.userAgent,
-      id: parseInt((location.search.match(/\?id=(.*)/) || [])[1], 10) || null
+      id: browserId
     });
   });
 };
diff --git a/test/client/karma.spec.js b/test/client/karma.spec.js
@@ -78,11 +78,14 @@ describe('karma', function() {
 
 
   it('should report browser id', function() {
+    windowLocation.search = '?id=567';
+    socket = new MockSocket();
+    k = new Karma(socket, {}, windowNavigator, windowLocation);
+
     var spyInfo = jasmine.createSpy('onInfo').andCallFake(function(info) {
-      expect(info.id).toBe(567);
+      expect(info.id).toBe('567');
     });
 
-    windowLocation.search = '?id=567';
     socket.on('register', spyInfo);
     socket.emit('connect');