Fixing Sauce support, adding badge to README.

Author: Ændrew Rininsland

.gitignore

@@ -3,3 +3,4 @@
 node_modules/
 npm-debug.log
 coverage/
+sauce.json

.travis.yml

@@ -12,5 +12,5 @@ node_js:
 script:
   - gulp lint
   - gulp test:ci
-  - mocha test/ --timeout=60000
+  - mocha test/
   - npm run-script codecov

README.md

@@ -18,6 +18,10 @@ Alternatively, you can install the library using Bower:
 bower install github-api
 ```
 
+## Compatibility
+
+[![Sauce Test Status](https://saucelabs.com/browser-matrix/githubjs.svg)](https://saucelabs.com/u/githubjs)
+
 ## Usage
 
 Create a Github instance.

gulpfile.js

@@ -16,7 +16,7 @@ function runTests(singleRun, isCI, done) {
    var files = [
       path.join(__dirname, 'test/vendor/*.js'), // PhantomJS 1.x polyfills
       path.join(__dirname, 'github.js'),
-      path.join(__dirname, 'test/*.js')
+      path.join(__dirname, 'test/test.*.js')
    ];
 
    if (singleRun) {
@@ -45,11 +45,24 @@ function runTests(singleRun, isCI, done) {
 
    if (isCI) {
       localConfig.sauceLabs = {
-         testName: 'GitHub.js UAT tests'
+         testName: 'GitHub.js UAT tests',
+         idleTimeout: 120000,
+         recordVideo: false
       };
+
+      // Increase timeouts massively so Karma doesn't timeout in Sauce tunnel.
+      localConfig.browserNoActivityTimeout = 400000;
+      localConfig.captureTimeout = 120000;
       localConfig.customLaunchers = sauceLaunchers;
       localConfig.browsers = Object.keys(sauceLaunchers);
       reporters.push('saucelabs');
+
+      // Set Mocha timeouts to longer.
+      localConfig.client = {
+         mocha: {
+            timeout: 20000
+         }
+      };
    }
 
    var server = new karma.Server(localConfig, function(failCount) {
@@ -117,12 +130,6 @@ var sauceLaunchers = {
       platform: 'OS X 10.10',
       version: '8'
    },
-   SL_IE_9: {
-      base: 'SauceLabs',
-      browserName: 'internet explorer',
-      platform: 'Windows 2008',
-      version: '9'
-   },
    SL_IE_10: {
       base: 'SauceLabs',
       browserName: 'internet explorer',

karma.conf.js

@@ -3,9 +3,14 @@ module.exports = function(config) {
 
    var configuration = {
       client: {
-         captureConsole: true
+         captureConsole: true,
+         mocha: {
+            timeout: 10000
+         }
       },
 
+      concurrency: 2,
+
       singleRun: true,
 
       autoWatch: false,

package.json

@@ -26,6 +26,7 @@
     "karma-json-fixtures-preprocessor": "0.0.5",
     "karma-mocha": "^0.2.0",
     "karma-mocha-reporter": "^1.1.1",
+    "karma-safari-launcher": "^0.1.1",
     "karma-sauce-launcher": "^0.3.0",
     "mocha": "^2.3.3"
   },

test/mocha.opts

@@ -0,0 +1 @@
+--timeout 10000

test/test.repo.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var github, repo, user, testUser, timeout, imageB64, imageBlob;
+var github, repo, user, testUser, imageB64, imageBlob;
 
 if (typeof window === 'undefined') { // We're in NodeJS
    // Module dependencies
@@ -12,17 +12,12 @@ if (typeof window === 'undefined') { // We're in NodeJS
    // Use should flavour for Mocha
    var should = chai.should();
 
-   // Long timeouts for Mocha.
-   timeout = 60000;
-
    var fs = require('fs');
    var path = require('path');
 
    imageBlob = fs.readFileSync(path.join(__dirname, 'gh.png')); // This is a Buffer().
    imageB64 = imageBlob.toString('base64');
 } else { // We're in the browser
-   timeout = 12000; // Shorter timeouts for Karma!
-
    if (typeof window._phantom !== 'undefined') {
       var xhr = new XMLHttpRequest();
 
@@ -50,8 +45,6 @@ if (typeof window === 'undefined') { // We're in NodeJS
 }
 
 describe('Github.Repository', function() {
-   this.timeout(timeout); // Bit of a longer timeout
-
    before(function() {
       if (typeof window !== 'undefined') testUser = window.__fixtures__['test/user'];
 
@@ -160,8 +153,6 @@ describe('Creating new Github.Repository', function() {
 
       user = github.getUser();
       repo = github.getRepo(testUser.USERNAME, repoTest);
-
-      this.timeout(timeout);
    });
 
    it('should create repo', function(done) {

test/test.user.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var testUser, user, github, timeout;
+var testUser, user, github;
 
 if (typeof window === 'undefined') {
    // Module dependencies
@@ -11,15 +11,9 @@ if (typeof window === 'undefined') {
 
    // Use should flavour for Mocha
    var should = chai.should();
-
-   timeout = 60000;
-} else {
-   timeout = 12000;
 }
 
 describe('Github.User', function() {
-   this.timeout(timeout);
-
    before(function() {
       if (typeof window !== 'undefined') testUser = window.__fixtures__['test/user'];
       github = new Github({
@@ -96,7 +90,8 @@ describe('Github.User', function() {
    });
 
    it('should show user\'s repos', function(done) {
-      user.userRepos(testUser.USERNAME, function(err) {
+      // This is odd; userRepos times out on the test user, but user.repos does not.
+      user.userRepos('aendrew', function(err) {
          should.not.exist(err);
          done();
       });