Fixed linting issue after last merge, made repo.delete an alias for repo.remove, fixed repo.remove, fixed window undefined issue in Node, added Mocha tests to Travis.

Author: Ændrew Rininsland

.travis.yml

@@ -8,4 +8,5 @@ node_js:
   - "0.10"
 script:
   - npm test
+  - mocha test/ --timeout=60000
   - npm run-script codecov

github.js

@@ -11,30 +11,31 @@
  */
 
 (function (root, factory) {
-  // UMD boilerplate from https://github.com/umdjs/umd/blob/master/returnExportsGlobal.js
-  'use strict';
-
-  /* istanbul ignore next */
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['xmlhttprequest', 'js-base64'], function (XMLHttpRequest, b64encode) {
-      return (root.Github = factory(XMLHttpRequest.XMLHttpRequest, b64encode.Base64.encode));
-    });
-  } else if (typeof module === 'object' && module.exports) {
-    if (window) {
-     module.exports = factory(window.XMLHttpRequest, window.btoa);
-    } else {
-     module.exports = factory(require('xmlhttprequest').XMLHttpRequest, require('js-base64').Base64.encode);
-    }
-  } else {
-    // Browser globals
-    var b64encode = function(str) {
-      return root.btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function(match, p1) {
-        return String.fromCharCode('0x' + p1);
-      }));
-    };
-    root.Github = factory(root.XMLHttpRequest, b64encode);
-  }
+   // UMD boilerplate from https://github.com/umdjs/umd/blob/master/returnExportsGlobal.js
+   'use strict';
+
+   /* istanbul ignore next */
+   if (typeof define === 'function' && define.amd) {
+      // AMD. Register as an anonymous module.
+      define(['xmlhttprequest', 'js-base64'], function (XMLHttpRequest, b64encode) {
+         return (root.Github = factory(XMLHttpRequest.XMLHttpRequest, b64encode.Base64.encode));
+      });
+   } else if (typeof module === 'object' && module.exports) {
+      if (typeof window !== 'undefined') { // jscs:ignore
+         module.exports = factory(window.XMLHttpRequest, window.btoa);
+      } else { // jscs:ignore
+         module.exports = factory(require('xmlhttprequest').XMLHttpRequest, require('js-base64').Base64.encode);
+      }
+   } else {
+      // Browser globals
+      var b64encode = function(str) {
+         return root.btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function(match, p1) {
+            return String.fromCharCode('0x' + p1);
+         }));
+      };
+
+      root.Github = factory(root.XMLHttpRequest, b64encode);
+   }
 }(this, function (XMLHttpRequest, b64encode) {
    'use strict';
 
@@ -55,7 +56,7 @@
 
             url += ((/\?/).test(url) ? '&' : '?');
 
-            if (data && typeof data === 'object' && ['GET', 'HEAD'].indexOf(method) > -1) {
+            if (data && typeof data === 'object' && ['GET', 'HEAD', 'DELETE'].indexOf(method) > -1) {
                for(var param in data) {
                   if (data.hasOwnProperty(param))
                     url += '&' + encodeURIComponent(param) + '=' + encodeURIComponent(data[param]);
@@ -720,24 +721,9 @@
             });
          };
 
-         // Delete a file from the tree
+         // Alias for repo.remove for backwards comapt.
          // -------
-
-         this.delete = function(branch, path, cb) {
-            that.getSha(branch, path, function(err, sha) {
-               if (!sha) return cb('not found', null);
-               var delPath = repoPath + '/contents/' + path;
-               var params = {
-                  message: 'Deleted ' + path,
-                  sha: sha
-               };
-
-               delPath += '?message=' + encodeURIComponent(params.message);
-               delPath += '&sha=' + encodeURIComponent(params.sha);
-               delPath += '&branch=' + encodeURIComponent(branch);
-               _request('DELETE', delPath, null, cb);
-            });
-         };
+         this.delete = this.remove;
 
          // Move a file to a new location
          // -------

test/test.repo.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var github, repo, user, testUser;
+var github, repo, user, testUser, timeout;
 
 if (typeof window === 'undefined') {
    // Module dependencies
@@ -11,9 +11,17 @@ if (typeof window === 'undefined') {
 
    // Use should flavour for Mocha
    var should = chai.should();
+
+   // Long timeouts for Mocha.
+   timeout = 60000;
+} else {
+   // Short timeouts for Karma!
+   timeout = 12000;
 }
 
 describe('Github.Repository', function() {
+   this.timeout(timeout); // Bit of a longer timeout
+
    before(function() {
       if (typeof window !== 'undefined') testUser = window.__fixtures__['test/user'];
 
@@ -122,6 +130,8 @@ describe('Creating new Github.Repository', function() {
 
       user = github.getUser();
       repo = github.getRepo(testUser.USERNAME, repoTest);
+
+      this.timeout(timeout);
    });
 
    it('should create repo', function(done) {
@@ -144,8 +154,6 @@ describe('Creating new Github.Repository', function() {
    });
 
    it('should write to repo branch', function(done) {
-      this.timeout(8000); // Bit of a longer timeout
-
       repo.branch('master', 'dev', function(err) {
          should.not.exist(err);
          repo.write('dev', 'TEST.md', 'THIS IS AN UPDATED TEST', 'Updating test', function(err) {
@@ -221,6 +229,28 @@ describe('Creating new Github.Repository', function() {
       });
    });
 
+   it('should delete a file on the repo', function(done) {
+      repo.write('master', 'REMOVE-TEST.md', 'THIS IS A TEST', 'Remove test', function(err) {
+         should.not.exist(err);
+
+         repo.remove('master', 'REMOVE-TEST.md', function(err) {
+            should.not.exist(err);
+            done();
+         });
+      });
+   });
+
+   it('should use repo.delete as an alias for repo.remove', function(done) {
+      repo.write('master', 'REMOVE-TEST.md', 'THIS IS A TEST', 'Remove test', function(err) {
+         should.not.exist(err);
+
+         repo.delete('master', 'REMOVE-TEST.md', function(err) {
+            should.not.exist(err);
+            done();
+         });
+      });
+   });
+
    it('should list pull requests on repo', function(done) {
       repo.listPulls('open', function(err) {
          should.not.exist(err);
@@ -275,8 +305,6 @@ describe('Creating new Github.Repository', function() {
    });
 
    it('should pass a regression test for _request (#14)', function(done) {
-      this.timeout(8000); // Bit of a longer timeout
-
       repo.getRef('heads/master', function(err, sha) {
          var refSpec = {
             ref: 'refs/heads/testing-14', sha: sha

test/test.user.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var testUser, user, github;
+var testUser, user, github, timeout;
 
 if (typeof window === 'undefined') {
    // Module dependencies
@@ -11,9 +11,15 @@ 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({
@@ -22,13 +28,9 @@ describe('Github.User', function() {
          auth: 'basic'
       });
       user = github.getUser();
-
-      this.timeout(8000); // Bit of a longer timeout
    });
 
    it('should get user.repos', function(done) {
-      this.timeout(8000); // Bit of a longer timeout
-
       user.repos(function(err) {
          should.not.exist(err);
          done();