Allow for case where we don't need to move package

Author: chriskrycho

ts/tests/blueprints/ember-cli-typescript-test.ts

@@ -5,6 +5,7 @@ import path from 'path';
 import helpers from 'ember-cli-blueprint-test-helpers/helpers';
 import chaiHelpers from 'ember-cli-blueprint-test-helpers/chai';
 import Blueprint from 'ember-cli/lib/models/blueprint';
+import ts from 'typescript';
 
 import { setupPublishedVersionStashing } from '../helpers/stash-published-version';
 import ects from '../../blueprints/ember-cli-typescript/index';
@@ -71,7 +72,7 @@ describe('Acceptance: ember-cli-typescript generator', function () {
     const tsconfig = file('tsconfig.json');
     expect(tsconfig).to.exist;
 
-    const tsconfigJson = JSON.parse(tsconfig.content);
+    const tsconfigJson = ts.parseConfigFileTextToJson('tsconfig.json', tsconfig.content).config;
     expect(tsconfigJson.compilerOptions.paths).to.deep.equal({
       'my-app/tests/*': ['tests/*'],
       'my-app/*': ['app/*'],
@@ -121,7 +122,7 @@ describe('Acceptance: ember-cli-typescript generator', function () {
     const tsconfig = file('tsconfig.json');
     expect(tsconfig).to.exist;
 
-    const tsconfigJson = JSON.parse(tsconfig.content);
+    const tsconfigJson = ts.parseConfigFileTextToJson('tsconfig.json', tsconfig.content).config;
     expect(tsconfigJson.compilerOptions.paths).to.deep.equal({
       'dummy/tests/*': ['tests/*'],
       'dummy/*': ['tests/dummy/app/*', 'app/*'],
@@ -197,7 +198,7 @@ describe('Acceptance: ember-cli-typescript generator', function () {
     const tsconfig = file('tsconfig.json');
     expect(tsconfig).to.exist;
 
-    const json = JSON.parse(tsconfig.content);
+    const json = ts.parseConfigFileTextToJson('tsconfig.json', tsconfig.content).config;
     expect(json.compilerOptions.paths).to.deep.equal({
       'my-app/tests/*': ['tests/*'],
       'my-app/*': ['app/*', 'lib/my-addon-1/app/*', 'lib/my-addon-2/app/*'],
@@ -243,7 +244,7 @@ describe('Acceptance: ember-cli-typescript generator', function () {
     const tsconfig = file('tsconfig.json');
     expect(tsconfig).to.exist;
 
-    const json = JSON.parse(tsconfig.content);
+    const json = ts.parseConfigFileTextToJson('tsconfig.json', tsconfig.content).config;
     expect(json.compilerOptions.paths).to.deep.equal({
       'my-app/tests/*': ['tests/*'],
       'my-app/mirage/*': ['mirage/*'],
@@ -269,7 +270,7 @@ describe('Acceptance: ember-cli-typescript generator', function () {
     const tsconfig = file('tsconfig.json');
     expect(tsconfig).to.exist;
 
-    const json = JSON.parse(tsconfig.content);
+    const json = ts.parseConfigFileTextToJson('tsconfig.json', tsconfig.content).config;
     expect(json.compilerOptions.paths).to.deep.equal({
       'dummy/tests/*': ['tests/*'],
       'dummy/mirage/*': ['tests/dummy/mirage/*'],

ts/tests/helpers/stash-published-version.ts

@@ -2,6 +2,19 @@ import fs from 'fs-extra';
 
 const PACKAGE_PATH = 'node_modules/ember-cli-typescript';
 
+function isNodeError(e: unknown): e is NodeJS.ErrnoException {
+  // Not full-proof but good enough for our purposes.
+  return e instanceof Error && 'code' in e;
+}
+
+function handleError(e: unknown) {
+  // Ignore the case where we just don't have the files to move. (And hope this
+  // works correctly?)
+  if (!isNodeError(e) || e.code !== 'ENOENT') {
+    throw e;
+  }
+}
+
 /**
  * We have assorted devDependencies that themselves depend on `ember-cli-typescript`.
  * This means we have a published copy of the addon present in `node_modules` normally,
@@ -12,10 +25,19 @@ const PACKAGE_PATH = 'node_modules/ember-cli-typescript';
  */
 export function setupPublishedVersionStashing(hooks: Mocha.Suite): void {
   hooks.beforeAll(async () => {
-    await fs.move(PACKAGE_PATH, `${PACKAGE_PATH}.published`);
+    fs.move(PACKAGE_PATH, `${PACKAGE_PATH}.published`).catch();
+    try {
+      await fs.move(PACKAGE_PATH, `${PACKAGE_PATH}.published`);
+    } catch (e: unknown) {
+      handleError(e);
+    }
   });
 
   hooks.afterAll(async () => {
-    await fs.move(`${PACKAGE_PATH}.published`, PACKAGE_PATH);
+    try {
+      await fs.move(`${PACKAGE_PATH}.published`, PACKAGE_PATH);
+    } catch (e) {
+      handleError(e);
+    }
   });
 }