test: fix syntax, remove globals

socketio · Jan 5, 2014 · 8ede274 · 8ede274
1 parent 1f02fcf
commit 8ede274
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 45 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,6 @@ REPORTER = dot
 
 test:
 	@./node_modules/.bin/mocha \
-		--require test/common \
 		--reporter $(REPORTER) \
 		--slow 500ms \
 		--bail \

diff --git a/test/common.js b/test/common.js
@@ -1,39 +1,21 @@
 
 /**
- * Expose `eio` global.
+ * Module dependencies.
  */
 
-global.eio = require('../index');
-
-/**
- * Expose client.
- */
-
-global.eioc = require('engine.io-client');
-
-/**
- * Expose `request` global.
- */
-
-global.request = require('superagent');
-
-/**
- * Expose `expect` global
- */
-
-global.expect = require('expect.js');
+var eio = require('..');
 
 /**
  * Listen shortcut that fires a callback on an epheemal port.
  */
 
-global.listen = function (opts, fn) {
+exports.listen = function (opts, fn) {
   if ('function' == typeof opts) {
     fn = opts;
     opts = {};
   }
 
-  var e = global.eio.listen(null, opts, function () {
+  var e = eio.listen(null, opts, function () {
     fn(e.httpServer.address().port);
   });
 

diff --git a/test/engine.io.js b/test/engine.io.js
@@ -1,11 +1,14 @@
-/*global eio,listen,request,expect*/
 
 /**
  * Test dependencies.
  */
 
-var net = require('net')
-  , http = require('http');
+var net = require('net');
+var eio = require('..');
+var listen = require('./common').listen;
+var expect = require('expect.js');
+var request = require('superagent');
+var http = require('http');
 
 /**
  * Tests.

diff --git a/test/jsonp.js b/test/jsonp.js
@@ -1,17 +1,24 @@
-/*global eio,eioc,listen,request,expect*/
+
+/**
+ * Module dependencies.
+ */
 
 var http = require('http');
+var eioc = require('engine.io-client');
+var listen = require('./common').listen;
+var expect = require('expect.js');
+var request = require('superagent');
 var WebSocket = require('ws');
 
 describe('JSONP', function () {
   before(function () {
     // we have to override the browser's functionality for JSONP
     document = {
       body: {
-        appendChild: function () {}
-        , removeChild: function () {}
+        appendChild: function(){},
+        removeChild: function(){}
       }
-    }
+    };
 
     document.createElement = function (name) {
       var self = this;
@@ -31,16 +38,20 @@ describe('JSONP', function () {
         return script;
       } else if ('form' == name) {
         var form = {
-          style: {}
-            , action: ''
-            , parentNode: { removeChild: function () {} }
-            , removeChild: function () {}
-            , setAttribute: function () {}
-            , appendChild: function (elem) { area: elem; }
-            , submit: function () {
-              request.post(this.action).type('form').send({ d: self.areaValue }).end(function (res) {});
-            }
-        }
+          style: {},
+          action: '',
+          parentNode: { removeChild: function(){} },
+          removeChild: function(){},
+          setAttribute: function(){},
+          appendChild: function(){},
+          submit: function(){
+            request
+            .post(this.action)
+            .type('form')
+            .send({ d: self.areaValue })
+            .end(function(){});
+          }
+        };
         return form;
       } else if ('textarea' == name) {
         var textarea = {};
@@ -134,9 +145,9 @@ describe('JSONP', function () {
 
     it('should trigger when client closes', function (done) {
       var engine = listen( { allowUpgrades: false, transports: ['polling'] }, function (port) {
-          var socket = new eioc.Socket('ws://localhost:' + port
-            , { transports: ['polling'], forceJSONP: true, upgrade: false })
-            , total = 2;
+        var socket = new eioc.Socket('ws://localhost:' + port
+          , { transports: ['polling'], forceJSONP: true, upgrade: false })
+          , total = 2;
 
         engine.on('connection', function (conn) {
           conn.on('close', function (reason) {

diff --git a/test/server.js b/test/server.js
@@ -1,10 +1,14 @@
-/*global eio,eioc,listen,request,expect*/
 
 /**
  * Tests dependencies.
  */
 
 var http = require('http');
+var eio = require('..');
+var eioc = require('engine.io-client');
+var listen = require('./common').listen;
+var expect = require('expect.js');
+var request = require('superagent');
 var WebSocket = require('ws');
 
 /**
@@ -683,7 +687,7 @@ describe('server', function () {
               expect(clientCloseReason).to.be(null);
             }, 350);
             setTimeout(function() {
-              expect(clientCloseReason).to.be("ping timeout");
+              expect(clientCloseReason).to.be('ping timeout');
               done();
             }, 500);
           });