fixes

Author: MoLow

test/unit/auth.test.js

@@ -19,39 +19,34 @@ const MOCKED_TOKEN = JSON.stringify({
 
 describe('auth', async function() {
   it('asks for auth data if no ncurc is found', async function() {
-    this.timeout(2000);
     await runAuthScript(
       undefined,
       [FIRST_TIME_MSG, MOCKED_TOKEN]
     );
   });
 
   it('asks for auth data if ncurc is invalid json', async function() {
-    this.timeout(2000);
     await runAuthScript(
       { HOME: 'this is not json' },
       [FIRST_TIME_MSG, MOCKED_TOKEN]
     );
   });
 
   it('returns ncurc data if valid in HOME', async function() {
-    this.timeout(2000);
     await runAuthScript(
       { HOME: { username: 'nyancat', token: '0123456789abcdef' } },
       [MOCKED_TOKEN]
     );
   });
 
   it('returns ncurc data if valid in XDG_CONFIG_HOME', async function() {
-    this.timeout(2000);
     await runAuthScript(
       { HOME: { username: 'nyancat', token: '0123456789abcdef' } },
       [MOCKED_TOKEN]
     );
   });
 
   it('prefers XDG_CONFIG_HOME/ncurc to HOME/.ncurc', async function() {
-    this.timeout(2000);
     await runAuthScript(
       {
         HOME: { username: 'notnyancat', token: 'somewrongtoken' },
@@ -62,7 +57,6 @@ describe('auth', async function() {
   });
 
   it("prints an error message if it can't generate a token", async function() {
-    this.timeout(2000);
     await runAuthScript(
       {},
       [FIRST_TIME_MSG],
@@ -71,7 +65,6 @@ describe('auth', async function() {
   });
 
   it('does not accept a non-string username', async function() {
-    this.timeout(2000);
     await runAuthScript(
       { HOME: { username: {}, token: '0123456789abcdef' } },
       [],
@@ -80,7 +73,6 @@ describe('auth', async function() {
   });
 
   it('does not accept a non-string token', async function() {
-    this.timeout(2000);
     await runAuthScript(
       { HOME: { username: 'nyancat', token: 42 } },
       [],
@@ -89,7 +81,6 @@ describe('auth', async function() {
   });
 
   it('does not accept an invalid username format', async function() {
-    this.timeout(2000);
     await runAuthScript(
       { HOME: { username: ' ^^^ ', token: '0123456789abcdef' } },
       [],
@@ -99,7 +90,6 @@ describe('auth', async function() {
   });
 
   it('does not accept an invalid token format', async function() {
-    this.timeout(2000);
     await runAuthScript(
       { HOME: { username: 'nyancat', token: '@fhqwhgads' } },
       [],
@@ -108,15 +98,13 @@ describe('auth', async function() {
   });
 
   it('permits capital letters in token format', async function() {
-    this.timeout(2000);
     await runAuthScript(
       { HOME: { username: 'nyancat', token: '0123456789ABCDEF' } },
       ['{"github":"bnlhbmNhdDowMTIzNDU2Nzg5QUJDREVG"}']
     );
   });
 
   it('permits underscores in token format', async function() {
-    this.timeout(2000);
     await runAuthScript(
       { HOME: { username: 'nyancat', token: 'ghp_0123456789ABCDEF' } },
       ['{"github":"bnlhbmNhdDpnaHBfMDEyMzQ1Njc4OUFCQ0RFRg=="}']

test/unit/cli.test.js

@@ -41,6 +41,8 @@ describe('cli', () => {
 
     describe('spinners', () => {
       beforeEach(() => {
+        stream = new LogStream();
+        cli = new CLI(stream);
         cli.startSpinner('foo');
       });
 
@@ -59,20 +61,34 @@ describe('cli', () => {
     });
 
     describe('write', () => {
+      beforeEach(() => {
+        stream = new LogStream();
+        cli = new CLI(stream);
+      });
       it('should write in stream', () => {
+        const stream = new LogStream();
+        const cli = new CLI(stream);
         cli.write('Getting commits...');
-        assert.strictEqual(logResult(), 'Getting commits...');
+        assert.strictEqual(strip(stream.toString()), 'Getting commits...');
       });
     });
 
     describe('log', () => {
+      beforeEach(() => {
+        stream = new LogStream();
+        cli = new CLI(stream);
+      });
       it('should write in stream', () => {
         cli.log('Getting commits...');
         assert.strictEqual(logResult(), 'Getting commits...\n');
       });
     });
 
     describe('table', () => {
+      beforeEach(() => {
+        stream = new LogStream();
+        cli = new CLI(stream);
+      });
       it('should print the first element with bold style and padding', () => {
         cli.table('Title', 'description');
         assert.strictEqual(logResult(),
@@ -81,6 +97,10 @@ describe('cli', () => {
     });
 
     describe('separator', () => {
+      beforeEach(() => {
+        stream = new LogStream();
+        cli = new CLI(stream);
+      });
       it('should print a separator line with the specified text', () => {
         cli.separator('Separator');
         assert.strictEqual(
@@ -106,6 +126,10 @@ describe('cli', () => {
     });
 
     describe('ok', () => {
+      beforeEach(() => {
+        stream = new LogStream();
+        cli = new CLI(stream);
+      });
       it('should print a success message', () => {
         cli.ok('Perfect!');
         assert.strictEqual(logResult(), `   ${success}  Perfect!\n`);
@@ -119,6 +143,10 @@ describe('cli', () => {
     });
 
     describe('warn', () => {
+      beforeEach(() => {
+        stream = new LogStream();
+        cli = new CLI(stream);
+      });
       it('should print a warning message', () => {
         cli.warn('Warning!');
         assert.strictEqual(logResult(), `   ${warning}  Warning!\n`);
@@ -132,6 +160,10 @@ describe('cli', () => {
     });
 
     describe('info', () => {
+      beforeEach(() => {
+        stream = new LogStream();
+        cli = new CLI(stream);
+      });
       it('should print an info message', () => {
         cli.info('Info!');
         assert.strictEqual(logResult(), `   ${info}  Info!\n`);
@@ -144,6 +176,10 @@ describe('cli', () => {
     });
 
     describe('error', () => {
+      beforeEach(() => {
+        stream = new LogStream();
+        cli = new CLI(stream);
+      });
       it('should print an error message', () => {
         cli.error('Error!');
         assert.strictEqual(logResult(), `   ${error}  Error!\n`);
@@ -184,6 +220,7 @@ describe('cli', () => {
         questionType: cli.QUESTION_TYPE.INPUT
       });
       assert.strictEqual(cli.spinner.isSpinning, true);
+      cli.stopSpinner('foo');
     });
   });