handle case where websocket does not have on method; add tests

Author: avistramer

lib/transport/websocket.js

@@ -54,9 +54,10 @@ function WebSocketTransport(transUrl, ignore, options) {
     self.emit('close', 1006, 'WebSocket connection broken');
     self._cleanup();
   };
-  this.ws.on('drain', function() {
-    self.emit('drain');
-  })
+  if (this.ws.on)
+    this.ws.on('drain', function() {
+      self.emit('drain');
+    });
 }
 
 inherits(WebSocketTransport, EventEmitter);

tests/lib/senders.js

@@ -63,6 +63,22 @@ function ajaxStreaming (Obj) {
   });
 }
 
+function ajaxCustomHeaders (Obj) {
+  it('simple', function (done) {
+    var x = new Obj('GET', testUtils.getSameOriginUrl() + '/echo-custom-data-header.txt', null, 
+      { headers: { 'X-Custom-Data': 'abc' }});
+    x.on('finish', function (status, text) {
+      try {
+        expect(text).to.equal('abc');
+      } catch (e) {
+        done(e);
+        return;
+      }
+      done();
+    });
+  });
+}
+
 function wrongUrl(Obj, url, statuses) {
   it('wrong url ' + url, function (done) {
     var test = this.runnable();
@@ -110,6 +126,7 @@ describe('Senders', function () {
   describe('xhr-local', function () {
     ajaxSimple(XhrLocal);
     ajaxStreaming(XhrLocal);
+    ajaxCustomHeaders(XhrLocal);
     // TODO senders don't have a timeouts so these tests can fail
     // BUT info-receiver has a timeout so they will never not-return
     // wrongPort(XhrLocal);
@@ -123,6 +140,7 @@ describe('Senders', function () {
     }
     ajaxSimple(Xdr);
     ajaxStreaming(Xdr);
+    ajaxCustomHeaders(Xdr);
     wrongPort(Xdr);
     wrongUrl(Xdr, testUtils.getSameOriginUrl() + '/wrong_url_indeed.txt', [0, 400]);
   });

tests/support/sockjs_server.js

@@ -42,6 +42,11 @@ function startServer(port, config, prefix) {
       res.setHeader('Access-Control-Allow-Origin', '*');
       res.writeHead(200);
       res.end(new Array(2049).join('a') + '\nb\n');
+    } else if ( /\/echo-custom-data-header.txt/.test(req.url) ) {
+      res.setHeader('content-type', 'text/plain');
+      res.setHeader('Access-Control-Allow-Origin', '*');
+      res.writeHead(200);
+      res.end(req.headers['x-custom-data'] || '');
     } else if (req.url === '/config.js') {
       if (req.headers.referer) {
         var parsedOrigin = new URL(req.headers.referer);