Fix tests to actually fail instead of timing out

Errors thrown in the callbacks don’t bubble up to the calling test and
make the tests timeout instead of fail.

Author: Clay Reimann

.gitignore

@@ -1,6 +1,8 @@
-.DS_Store
-.idea
-node_modules/
-npm-debug.log
+dist/
 coverage/
+node_modules/
+
+.idea
+.DS_Store
 sauce.json
+npm-debug.log

gulpfile.js

@@ -9,8 +9,6 @@ var stylish = require('gulp-jscs-stylish');
 var path = require('path');
 var karma = require('karma');
 
-console.log(Object.keys(webpack));
-
 /*
  * Code style enforcement
  */
@@ -42,7 +40,8 @@ function runTests(singleRun, isCI, done) {
    var files = [
       path.join(__dirname, 'test/vendor/*.js'), // PhantomJS 1.x polyfills
       path.join(__dirname, 'dist', 'github.min.js'),
-      path.join(__dirname, 'test/test.*.js')
+      path.join(__dirname, 'test', 'helpers.js'),
+      path.join(__dirname, 'test', 'test.*.js')
    ];
 
    if (singleRun) {

karma.conf.js

@@ -15,7 +15,7 @@ module.exports = function(config) {
 
       autoWatch: false,
 
-      frameworks: ['mocha', 'chai', 'phantomjs-shim'],
+      frameworks: ['mocha', 'chai'],
 
       browsers: ['Chrome'],
 

test/helpers.js

@@ -0,0 +1,18 @@
+'use strict';
+
+function callbackWithError(done, fn) {
+   var cb = function(err, response, xhr) {
+      try {
+         fn(err, response, xhr);
+      } catch(e) {
+         done(e);
+      }
+   };
+
+   return cb;
+}
+
+if (typeof window === 'undefined') {
+   // Export stuff (comment here to make linter happy)
+   module.exports = callbackWithError;
+}

test/test.auth.js

@@ -1,56 +1,52 @@
 'use strict';
 
-var testUser, github, user;
+var testUser;
 
 if (typeof window === 'undefined') {
-   // Module dependencies
-   var chai = require('chai');
    var Github = require('../');
+   var callbackWithError = require('./helpers.js');
 
    testUser = require('./user.json');
 
+   // Module dependencies
+   var chai = require('chai');
+
    // Use should flavour for Mocha
    var should = chai.should();
 }
 
-describe('Github constructor', function() {
+describe('Authentication', function() {
    before(function() {
       if (typeof window !== 'undefined') testUser = window.__fixtures__['test/user'];
+   });
 
-      github = new Github({
+   it('should authenticate with valid credentials', function(done) {
+      var github = new Github({
          username: testUser.USERNAME,
          password: testUser.PASSWORD,
          auth: 'basic'
       });
+      var user = github.getUser();
 
-      user = github.getUser();
-   });
-
-   it('should authenticate and return no errors', function(done) {
-      user.notifications(function(err) {
+      user.notifications(callbackWithError(done, function(err) {
          should.not.exist(err);
          done();
-      });
+      }));
    });
-});
-
-describe('Github constructor (failing case)', function() {
-   before(function() {
-      if (typeof window !== 'undefined') testUser = window.__fixtures__['test/user'];
 
-      github = new Github({
+   it('should fail authentication with invalid credentials', function(done) {
+      var github = new Github({
          username: testUser.USERNAME,
          password: 'fake124',
          auth: 'basic'
       });
-      user = github.getUser();
-   });
+      var user = github.getUser();
+
+      user.notifications(callbackWithError(done, function(err) {
+         err.status.should.equal(401, 'Return 401 status for bad auth');
+         err.response.data.message.should.equal('Bad credentials');
 
-   it('should fail authentication and return err', function(done) {
-      user.notifications(function(err) {
-         err.request.status.should.equal(401, 'Return 401 status for bad auth');
-         JSON.parse(err.request.responseText).message.should.equal('Bad credentials');
          done();
-      });
+      }));
    });
 });

test/test.issue.js

@@ -1,22 +1,25 @@
 'use strict';
 
-var testUser, github, issues;
+var testUser;
 
 if (typeof window === 'undefined') {
-   // Module dependencies
-   var chai = require('chai');
    var Github = require('../');
+   var callbackWithError = require('./helpers.js');
 
    testUser = require('./user.json');
 
+   // Module dependencies
+   var chai = require('chai');
+
    // Use should flavour for Mocha
    var should = chai.should();
 }
 
-describe('Github.Issue', function() {
+describe('Issues', function() {
+   var github, issues;
+
    before(function() {
       if (typeof window !== 'undefined') testUser = window.__fixtures__['test/user'];
-
       github = new Github({
          username: testUser.USERNAME,
          password: testUser.PASSWORD,
@@ -27,20 +30,21 @@ describe('Github.Issue', function() {
    });
 
    it('should list issues', function(done) {
-      issues.list({}, function(err, issues) {
+      issues.list({}, callbackWithError(done, function(err, issues) {
          should.not.exist(err);
          issues.should.have.length.above(0);
          done();
-      });
+      }));
    });
 
    it('should post issue comment', function(done) {
-      issues.list({}, function(err, issuesList) {
-         issues.comment(issuesList[0], 'Comment test', function(err, res) {
+      issues.list({}, callbackWithError(done, function(err, issuesList) {
+         should.not.exist(err);
+         issues.comment(issuesList[0], 'Comment test', callbackWithError(done, function(err, res) {
             should.not.exist(err);
             res.body.should.equal('Comment test');
             done();
-         });
-      });
+         }));
+      }));
    });
 });