Merge pull request #571 from github-tools/fix-tests

j-rewerts · web-flow · commit 1ba01edddb75 · 2019-06-17T14:06:19.000-06:00
Fix tests
diff --git a/mocha.opts b/mocha.opts
@@ -1,3 +1,3 @@
 --compilers js:babel-register
---timeout 15000
+--timeout 20000
 --slow 5000
diff --git a/test/auth.spec.js b/test/auth.spec.js
@@ -1,7 +1,7 @@
 import expect from 'must';
 
 import Github from '../lib/GitHub';
-import testUser from './fixtures/user.json';
+import testUser from './fixtures/user.js';
 import {assertSuccessful, assertFailure} from './helpers/callbacks';
 
 describe('Github', function() {
diff --git a/test/error.spec.js b/test/error.spec.js
@@ -3,7 +3,7 @@ import expect from 'must';
 import nock from 'nock';
 
 import Github from '../lib/GitHub';
-import testUser from './fixtures/user.json';
+import testUser from './fixtures/user.js';
 import {assertSuccessful, assertFailure} from './helpers/callbacks';
 import fixtureExhausted from './fixtures/repos-ratelimit-exhausted.js';
 import fixtureOk from './fixtures/repos-ratelimit-ok.js';
diff --git a/test/fixtures/record.js b/test/fixtures/record.js
@@ -2,7 +2,7 @@ import fs from 'fs';
 import nock from 'nock';
 import path from 'path';
 import GitHub from '../../lib/GitHub';
-import testUser from './user.json';
+import testUser from './user.js';
 
 const gh = new GitHub();
 
diff --git a/test/fixtures/repos-ratelimit-exhausted.js b/test/fixtures/repos-ratelimit-exhausted.js
@@ -3,7 +3,7 @@ import nock from 'nock';
 export default function fixture() {
    let scope;
    scope = nock('https://api.github.com:443', {"encodedQueryParams":true})
-     .get('/users/mikedeboertest/repos')
+     .get('/users/github-tools-test/repos')
      .query({"type":"all","sort":"updated","per_page":"100"})
      .reply(403, {"message":"API rate limit exceeded for 174.20.8.171. (But here's the good news: Authenticated requests get a higher rate limit. Check out the documentation for more details.)","documentation_url":"https://developer.github.com/v3/#rate-limiting"}, { server: 'GitHub.com',
      date: 'Sat, 18 Jun 2016 11:50:00 GMT',
diff --git a/test/fixtures/repos-ratelimit-ok.js b/test/fixtures/repos-ratelimit-ok.js
diff --git a/test/fixtures/user.js b/test/fixtures/user.js
@@ -0,0 +1,13 @@
+let user;
+
+if (process.env.GHTOOLS_USER) {
+   user = {
+      'USERNAME': process.env.GHTOOLS_USER,
+      'PASSWORD': process.env.GHTOOLS_PASSWORD,
+      'REPO': 'github',
+      'ORGANIZATION': 'github-api-tests',
+   };
+} else {
+   throw new Error('No testing account set up. Please email jaredrewerts@gmail.com to get access.');
+}
+export default user;
diff --git a/test/fixtures/user.json b/test/fixtures/user.json
diff --git a/test/gist.spec.js b/test/gist.spec.js
@@ -1,7 +1,7 @@
 import expect from 'must';
 
 import Github from '../lib/GitHub';
-import testUser from './fixtures/user.json';
+import testUser from './fixtures/user.js';
 import testGist from './fixtures/gist.json';
 import {assertSuccessful} from './helpers/callbacks';
 
@@ -22,7 +22,7 @@ describe('Gist', function() {
 
    describe('reading', function() {
       before(function() {
-         gist = github.getGist('f1c0f84e53aa6b98ec03');
+         gist = github.getGist('0ac3ef3451f4bdc9efec660ffce3e336');
       });
 
       it('should read a gist', function(done) {
diff --git a/test/issue.spec.js b/test/issue.spec.js
@@ -1,7 +1,7 @@
 import expect from 'must';
 
 import Github from '../lib/GitHub';
-import testUser from './fixtures/user.json';
+import testUser from './fixtures/user.js';
 import wait from './helpers/wait';
 import {assertSuccessful} from './helpers/callbacks';
 import getTestRepoName from './helpers/getTestRepoName';
diff --git a/test/markdown.spec.js b/test/markdown.spec.js
@@ -1,7 +1,7 @@
 import expect from 'must';
 
 import Github from '../lib/GitHub';
-import testUser from './fixtures/user.json';
+import testUser from './fixtures/user.js';
 
 describe('Markdown', function() {
    let github;
diff --git a/test/organization.spec.js b/test/organization.spec.js
@@ -1,7 +1,7 @@
 import expect from 'must';
 
 import Github from '../lib/GitHub';
-import testUser from './fixtures/user.json';
+import testUser from './fixtures/user.js';
 import {assertSuccessful, assertArray} from './helpers/callbacks';
 import getTestRepoName from './helpers/getTestRepoName';
 
diff --git a/test/project.spec.js b/test/project.spec.js
@@ -2,7 +2,7 @@ import expect from 'must';
 
 import Github from '../lib/GitHub';
 import wait from './helpers/wait';
-import testUser from './fixtures/user.json';
+import testUser from './fixtures/user.js';
 import {assertSuccessful} from './helpers/callbacks';
 import getTestRepoName from './helpers/getTestRepoName';
 
diff --git a/test/rate-limit.spec.js b/test/rate-limit.spec.js
@@ -1,7 +1,7 @@
 import expect from 'must';
 
 import Github from '../lib/GitHub';
-import testUser from './fixtures/user.json';
+import testUser from './fixtures/user.js';
 import {assertSuccessful} from './helpers/callbacks';
 
 describe('RateLimit', function() {
diff --git a/test/repository.spec.js b/test/repository.spec.js
@@ -2,7 +2,7 @@ import expect from 'must';
 
 import Github from '../lib/GitHub';
 import wait from './helpers/wait';
-import testUser from './fixtures/user.json';
+import testUser from './fixtures/user.js';
 import loadImage from './fixtures/imageBlob';
 import {assertSuccessful, assertFailure} from './helpers/callbacks';
 import getTestRepoName from './helpers/getTestRepoName';
@@ -626,8 +626,7 @@ describe('Repository', function() {
             treeSHA = commit.data.tree.sha;
             return remoteRepo.commit(parentSHA, treeSHA, 'is this thing on?');
          }).then((commit) => {
-            expect(commit.data.author).to.have.own('name', 'Mike de Boer');
-            expect(commit.data.author).to.have.own('email', 'mike@c9.io');
+            expect(commit.data.author).to.have.own('name', 'github-tools-test');
             done();
          });
       });
diff --git a/test/search.spec.js b/test/search.spec.js
@@ -2,7 +2,7 @@ import expect from 'must';
 import nock from 'nock';
 
 import Github from '../lib/GitHub';
-import testUser from './fixtures/user.json';
+import testUser from './fixtures/user.js';
 
 describe('Search', function() {
    this.timeout(20 * 1000); // eslint-disable-line no-invalid-this
diff --git a/test/team.spec.js b/test/team.spec.js
@@ -1,7 +1,7 @@
 import expect from 'must';
 
 import Github from '../lib/GitHub';
-import testUser from './fixtures/user.json';
+import testUser from './fixtures/user.js';
 import {assertFailure} from './helpers/callbacks';
 import getTestRepoName from './helpers/getTestRepoName';
 
diff --git a/test/user.spec.js b/test/user.spec.js
@@ -1,5 +1,5 @@
 import Github from '../lib/GitHub';
-import testUser from './fixtures/user.json';
+import testUser from './fixtures/user.js';
 import {assertSuccessful, assertArray} from './helpers/callbacks';
 
 describe('User', function() {
