update tests in the hope if fixes travis-ci

gillesruppert · Aug 24, 2012 · 25fc5de · 25fc5de
1 parent 573a233
commit 25fc5de
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 20 deletions.
diff --git a/test/connect-test.js b/test/connect-test.js
@@ -11,16 +11,18 @@ describe('connect middleware', function() {
 
   it('should return the compiled file when requesting a valid url ', function(done) {
     var path = normalize(__dirname + '/fixtures/main.js');
-    var server = connect().use(webmakeMw('/test.js', path)).listen(3000);
-
-    http.get('http://localhost:3000/test.js', helpers.successResponseCallback(done, server.close.bind(server)));
+    var server = connect().use(webmakeMw('/test.js', path)).listen(3000, function(err) {
+      if (err) throw err;
+      http.get('http://localhost:3000/test.js', helpers.successResponseCallback(done, server.close.bind(server)));
+    });
   });
 
   it('should return a 500 response when webmake has a problem with compiling the script', function(done) {
     var path = normalize(__dirname + '/fixtures/err.js');
-    var server = connect().use(webmakeMw('/error.js', path)).listen(3000);
-
-    http.get('http://localhost:3000/error.js', helpers.failureResponseCallback(done, server.close.bind(server)));
+    var server = connect().use(webmakeMw('/error.js', path)).listen(3000, function(err) {
+      if (err) throw err;
+      http.get('http://localhost:3000/error.js', helpers.failureResponseCallback(done, server.close.bind(server)));
+    });
   });
 
   it('should be configurable with an object', function(done){
@@ -35,8 +37,7 @@ describe('connect middleware', function() {
       function(cb) { http.get('http://localhost:3000/test2.js', helpers.successResponseCallback(cb)); }
     ], function(err) {
       if (err) throw err;
-      server.close();
-      done();
+      server.close(done);
     });
   });
 });

diff --git a/test/express-test.js b/test/express-test.js
@@ -11,16 +11,18 @@ describe('express framework', function() {
 
   it('should return the compiled file when requesting a valid url ', function(done) {
     var path = normalize(__dirname + '/fixtures/main.js');
-    var server = express().use(webmakeMw('/test.js', path)).listen(3000);
-
-    http.get('http://localhost:3000/test.js', helpers.successResponseCallback(done, server.close.bind(server)));
+    var server = express().use(webmakeMw('/test.js', path)).listen(3000, function(err) {
+      if (err) throw err;
+      http.get('http://localhost:3000/test.js', helpers.successResponseCallback(done, server.close.bind(server)));
+    });
   });
 
   it('should return a 500 response when webmake has a problem with compiling the script', function(done) {
     var path = normalize(__dirname + '/fixtures/err.js');
-    var server = express().use(webmakeMw('/error.js', path)).listen(3000);
-
-    http.get('http://localhost:3000/error.js', helpers.failureResponseCallback(done, server.close.bind(server)));
+    var server = express().use(webmakeMw('/error.js', path)).listen(3000, function(err) {
+      if (err) throw err;
+      http.get('http://localhost:3000/error.js', helpers.failureResponseCallback(done, server.close.bind(server)));
+    });
   });
 
   it('should be configurable with an object', function(done){
@@ -35,8 +37,7 @@ describe('express framework', function() {
       function(cb) { http.get('http://localhost:3000/test2.js', helpers.successResponseCallback(cb)); }
     ], function(err) {
       if (err) throw err;
-      server.close();
-      done();
+      server.close(done);
     });
   });
 });

diff --git a/test/helpers.js b/test/helpers.js
@@ -14,8 +14,8 @@ exports.successResponseCallback = function successResponseCallback(cb, close) {
 
     res.on('close', cb);
     res.on('end', function() {
-      if (close) close();
-      cb();
+      if (close) close(cb);
+      else cb();
     });
   }
 };
@@ -32,8 +32,8 @@ exports.failureResponseCallback = function failureResponseCallback(cb, close) {
 
     res.on('close', cb);
     res.on('end', function() {
-      if (close) close();
-      cb();
+      if (close) close(cb);
+      else cb();
     });
   }
 };