Added tests and refactored code (Part 2) (#4)

* refactor: Practiced a better separation of concerns

* refactor: Practiced early exit

* chore: Renamed test file

* chore: Moved the fixture-helpers file to the tests/helpers folder

* chore: Moved the test-helpers file to the tests/helpers folder

* chore: Created test setups that can be shared among the tests for each step

* refactor: Updated tests for analyzeAddon

* refactor: Updated tests for useRelativePaths

* refactor: Added tests for moveAddonFiles

Co-authored-by: ijlee2 <[email protected]>

Author: ijlee2

create-test-fixture.sh

@@ -51,7 +51,7 @@ fi
 mkdir -p "tests/fixtures/$DESTINATION/input"
 mkdir -p "tests/fixtures/$DESTINATION/output"
 
-echo "import { convertToJson } from '../../fixture-helpers.js';
+echo "import { convertToJson } from '../../helpers/fixture.js';
 
 const inputProject = convertToJson('$DESTINATION/input');
 const outputProject = convertToJson('$DESTINATION/output');

src/migration/ember-addon/steps/augment-options.js

@@ -20,6 +20,14 @@ function analyzePackageJson(options) {
       version,
     } = JSON.parse(packageJsonFile);
 
+    if (!name) {
+      throw new SyntaxError('Package name is missing.');
+    }
+
+    if (!version) {
+      throw new SyntaxError('Package version is missing.');
+    }
+
     const projectDependencies = new Map([
       ...Object.entries(dependencies ?? {}),
       ...Object.entries(devDependencies ?? {}),
@@ -35,7 +43,7 @@ function analyzePackageJson(options) {
     };
   } catch (e) {
     throw new SyntaxError(
-      `ERROR: package.json is missing or is not a valid JSON. (${e.message})\n`
+      `ERROR: package.json is missing or is not valid. (${e.message})\n`
     );
   }
 }
@@ -67,33 +75,21 @@ function analyzePackageManager(options) {
 }
 
 function deriveAddonLocation(addonPackage) {
-  if (!addonPackage.name) {
-    throw new SyntaxError(
-      'ERROR: In package.json, the package name is missing.'
-    );
+  // Package is not scoped
+  if (!addonPackage.name.includes('/')) {
+    return addonPackage.name;
   }
 
-  if (!addonPackage.version) {
+  // eslint-disable-next-line no-unused-vars
+  const [scope, packageName] = addonPackage.name.split('/');
+
+  if (!packageName) {
     throw new SyntaxError(
-      'ERROR: In package.json, the package version is missing.'
+      `ERROR: In package.json, the package name \`${addonPackage.name}\` is not valid.`
     );
   }
 
-  // Package is scoped
-  if (addonPackage.name.includes('/')) {
-    // eslint-disable-next-line no-unused-vars
-    const [scope, packageName] = addonPackage.name.split('/');
-
-    if (!packageName) {
-      throw new SyntaxError(
-        `ERROR: In package.json, the package name \`${addonPackage.name}\` is not valid.`
-      );
-    }
-
-    return packageName;
-  }
-
-  return addonPackage.name;
+  return packageName;
 }
 
 export function augmentOptions(options) {

tests/fixtures/ember-container-query-customizations/index.js

@@ -1,4 +1,4 @@
-import { convertToJson } from '../../fixture-helpers.js';
+import { convertToJson } from '../../helpers/fixture.js';
 
 const inputProject = convertToJson('ember-container-query-customizations/input');
 const outputProject = convertToJson('ember-container-query-customizations/output');

tests/fixtures/ember-container-query-javascript/index.js

@@ -1,4 +1,4 @@
-import { convertToJson } from '../../fixture-helpers.js';
+import { convertToJson } from '../../helpers/fixture.js';
 
 const inputProject = convertToJson('ember-container-query-javascript/input');
 const outputProject = convertToJson('ember-container-query-javascript/output');

tests/fixtures/ember-container-query-typescript/index.js

@@ -1,4 +1,4 @@
-import { convertToJson } from '../../fixture-helpers.js';
+import { convertToJson } from '../../helpers/fixture.js';
 
 const inputProject = convertToJson('ember-container-query-typescript/input');
 const outputProject = convertToJson('ember-container-query-typescript/output');

tests/fixtures/new-v1-addon-customizations/index.js

@@ -1,4 +1,4 @@
-import { convertToJson } from '../../fixture-helpers.js';
+import { convertToJson } from '../../helpers/fixture.js';
 
 const inputProject = convertToJson('new-v1-addon-customizations/input');
 const outputProject = convertToJson('new-v1-addon-customizations/output');

tests/fixtures/new-v1-addon-javascript/index.js

@@ -1,4 +1,4 @@
-import { convertToJson } from '../../fixture-helpers.js';
+import { convertToJson } from '../../helpers/fixture.js';
 
 const inputProject = convertToJson('new-v1-addon-javascript/input');
 const outputProject = convertToJson('new-v1-addon-javascript/output');

tests/fixtures/new-v1-addon-npm/index.js

@@ -1,4 +1,4 @@
-import { convertToJson } from '../../fixture-helpers.js';
+import { convertToJson } from '../../helpers/fixture.js';
 
 const inputProject = convertToJson('new-v1-addon-npm/input');
 const outputProject = convertToJson('new-v1-addon-npm/output');

tests/fixtures/new-v1-addon-pnpm/index.js

@@ -1,4 +1,4 @@
-import { convertToJson } from '../../fixture-helpers.js';
+import { convertToJson } from '../../helpers/fixture.js';
 
 const inputProject = convertToJson('new-v1-addon-pnpm/input');
 const outputProject = convertToJson('new-v1-addon-pnpm/output');

tests/fixtures/new-v1-addon-typescript/index.js

@@ -1,4 +1,4 @@
-import { convertToJson } from '../../fixture-helpers.js';
+import { convertToJson } from '../../helpers/fixture.js';
 
 const inputProject = convertToJson('new-v1-addon-typescript/input');
 const outputProject = convertToJson('new-v1-addon-typescript/output');