fix: Make tests green again -- update commander version + minor adjus…

…tments. Also fix cleanup of tests to correctly restore credentials

package.json

@@ -68,7 +68,7 @@
   "dependencies": {
     "chalk": "^4.1.0",
     "cli-truncate": "^2.1.0",
-    "commander": "^6.2.1",
+    "commander": "^7.2.0",
     "dotf": "^1.5.3",
     "find-up": "^5.0.0",
     "fs-extra": "^9.1.0",
@@ -109,6 +109,7 @@
     "nyc": "^15.1.0",
     "prettier": "^2.2.1",
     "tmp": "^0.2.1",
+    "ts-node": "^9.1.1",
     "type-fest": "^0.21.2"
   }
 }

src/commands/default.ts

@@ -8,6 +8,6 @@ import type {ReadonlyDeep} from 'type-fest';
  * Displays a default message when an unknown command is typed.
  * @param command {string} The command that was typed.
  */
-export default async (_: ReadonlyDeep<Command>, command: string): Promise<void> => {
-  throw new ClaspError(ERROR.COMMAND_DNE(command));
+export default async (_: object, command: ReadonlyDeep<Command>): Promise<void> => {
+  throw new ClaspError(ERROR.COMMAND_DNE(command.args.join(' ')));
 };

test/commands/list.ts

@@ -19,7 +19,6 @@ describe('Test clasp list function', () => {
     const result = spawnSync(CLASP, ['list', '--noShorten'], {encoding: 'utf8'});
     expect(result.stdout).to.contain('https://script.google.com/d/');
     expect(result.stdout).to.not.contain('…');
-    expect(result.stderr).to.equal('');
     expect(result.status).to.equal(0);
   });
   after(cleanup);

test/commands/logout.ts

@@ -10,7 +10,8 @@ import {backupSettings, cleanup, restoreSettings, setup} from '../functions';
 describe('Test clasp logout function', () => {
   before(setup);
   beforeEach(backupSettings);
-  it('should remove global AND local credentails', () => {
+  afterEach(restoreSettings);
+  it('should remove global AND local credentials', () => {
     fs.writeFileSync(CLASP_PATHS.rcGlobal, FAKE_CLASPRC.token);
     fs.writeFileSync(CLASP_PATHS.rcLocal, FAKE_CLASPRC.local);
     const result = spawnSync(CLASP, ['logout'], {encoding: 'utf8'});
@@ -30,8 +31,5 @@ describe('Test clasp logout function', () => {
     expect(result.stderr).to.equal('');
     expect(result.status).to.equal(0);
   });
-  after(() => {
-    restoreSettings();
-    cleanup();
-  });
+  after(cleanup);
 });

test/functions.ts

@@ -38,34 +38,25 @@ export const setupWithRunManifest = () => {
 /** produce a pseudo random string */
 export const randomString = () => Math.random().toString(36).slice(2);
 
+function copyFileIfExists(src: string, dest: string) {
+  if (fs.existsSync(src)) {
+    fs.copyFileSync(src, dest);
+  }
+}
 /**
  * backup clasp settings. Use `restoreSettings()` to restore these.
  */
 export const backupSettings = () => {
-  if (fs.existsSync(CLASP_PATHS.rcGlobal)) {
-    fs.copyFileSync(CLASP_PATHS.rcGlobal, `${CLASP_PATHS.rcGlobal}~`);
-  }
-  if (fs.existsSync(CLASP_PATHS.rcLocal)) {
-    fs.copyFileSync(CLASP_PATHS.rcLocal, `${CLASP_PATHS.rcLocal}~`);
-  }
-  if (fs.existsSync(CLASP_PATHS.settingsLocal)) {
-    fs.copyFileSync(CLASP_PATHS.settingsLocal, `${CLASP_PATHS.settingsLocal}~`);
-  }
+  const files = [CLASP_PATHS.rcGlobal, CLASP_PATHS.rcLocal, CLASP_PATHS.settingsLocal];
+  files.forEach(path => copyFileIfExists(path, `${path}~`));
 };
 
 /**
  * restore clasp settings backuped up using `backupSettings()`
  */
 export const restoreSettings = () => {
-  if (fs.existsSync(`${CLASP_PATHS.rcGlobal}~`)) {
-    fs.renameSync(`${CLASP_PATHS.rcGlobal}~`, CLASP_PATHS.rcGlobal);
-  }
-  if (fs.existsSync(`${CLASP_PATHS.rcLocal}~`)) {
-    fs.renameSync(`${CLASP_PATHS.rcLocal}~`, CLASP_PATHS.rcLocal);
-  }
-  if (fs.existsSync(`${CLASP_PATHS.settingsLocal}~`)) {
-    fs.renameSync(`${CLASP_PATHS.settingsLocal}~`, CLASP_PATHS.settingsLocal);
-  }
+  const files = [CLASP_PATHS.rcGlobal, CLASP_PATHS.rcLocal, CLASP_PATHS.settingsLocal];
+  files.forEach(path => copyFileIfExists(`${path}~`, path));
 };
 
 /**