modernise test helpers

Author: mansona

tests/helpers/assertions.ts

@@ -15,7 +15,7 @@ interface AssertGeneratedOptions {
   testAppLocation?: string;
   testAppName?: string;
   expectedStaticFiles?: string[];
-  packageManager?: 'npm' | 'yarn' | 'pnpm';
+  packageManager?: string;
   typeScript?: boolean;
   existingMonorepo?: boolean;
 }
@@ -35,27 +35,10 @@ export async function assertGeneratedCorrectly({
   typeScript = false,
   existingMonorepo = false,
 }: AssertGeneratedOptions) {
-  let addonPath = path.join(projectRoot, addonLocation ?? 'my-addon');
-  let testAppPath = path.join(projectRoot, testAppLocation ?? 'test-app');
-
+  let addonPath = path.join(projectRoot);
   expect(await fse.pathExists(addonPath), `${addonPath} exists`).toBe(true);
-  expect(await fse.pathExists(testAppPath), `${testAppPath} exists`).toBe(true);
-
   let addonPackageJson = await packageJsonAt(addonPath);
-  let testAppPackageJson = await packageJsonAt(testAppPath);
-
   expect(addonPackageJson.name, `addon has correct name: ${addonName}`).toEqual(addonName);
-  expect(testAppPackageJson.name, `testApp has correct name: ${testAppName ?? 'test-app'}`).toEqual(
-    testAppName ?? 'test-app',
-  );
-
-  expect(
-    [
-      ...Object.keys(testAppPackageJson.dependencies || {}),
-      ...Object.keys(testAppPackageJson.devDependencies || {}),
-    ],
-    `The test app has a (dev)dependency on the addon`,
-  ).to.include(addonName);
 
   for (let expectedFile of expectedStaticFiles) {
     let pathToFile = path.join(addonPath, expectedFile);
@@ -84,7 +67,7 @@ interface AssertECUOptions {
   addonLocation?: string;
   testAppLocation?: string;
   testAppName?: string;
-  packageManager: 'npm' | 'yarn' | 'pnpm';
+  packageManager: string;
   typeScript: boolean;
 }
 
@@ -105,11 +88,11 @@ export async function assertCorrectECUJson({
   expect(json.projectName).toEqual(addonName);
   expect(json.packages).toHaveLength(1);
 
-  expect(json.packages[0].name).toEqual('@embroider/addon-blueprint');
+  expect(json.packages[0].name).toEqual('@ember/addon-blueprint');
   expect(json.packages[0].version).toEqual(ownPkg.version);
 
   expect(json.packages[0].blueprints).toHaveLength(1);
-  expect(json.packages[0].blueprints[0].name).toEqual('@embroider/addon-blueprint');
+  expect(json.packages[0].blueprints[0].name).toEqual('@ember/addon-blueprint');
 
   if (packageManager !== 'npm') {
     expect(json.packages[0].blueprints[0].options).toContain(`--${packageManager}`);

tests/helpers/meta-helpers.ts

@@ -24,15 +24,14 @@ export class AddonHelper {
   #projectRoot?: string;
   #tmpDir?: string;
   #scenario: string;
-  #packageManager: 'npm' | 'pnpm' | 'yarn';
-  #addonFolder?: string;
+  #packageManager: 'npm' | 'pnpm';
   #args: string[];
   #fixtures: AddonFixtureHelper | undefined;
 
   constructor(options: {
     args?: string[];
     scenario?: string;
-    packageManager: 'pnpm' | 'npm' | 'yarn';
+    packageManager: 'pnpm' | 'npm';
   }) {
     this.#args = options.args || [];
     this.#scenario = options.scenario || 'default';
@@ -65,7 +64,6 @@ export class AddonHelper {
 
     // this is the project root
     this.#projectRoot = path.join(this.#tmpDir, name);
-    this.#addonFolder = path.join(this.#projectRoot, name);
 
     this.#fixtures = new AddonFixtureHelper({ cwd: this.#projectRoot, scenario: this.#scenario });
   }
@@ -114,12 +112,6 @@ export class AddonHelper {
 
     return this.#fixtures;
   }
-
-  get addonFolder() {
-    assert(this.#addonFolder, 'Cannot get addon folder. Was the Addon Helper `setup`?');
-
-    return this.#addonFolder;
-  }
 }
 
 export class AddonFixtureHelper {

tests/helpers/utils.ts

@@ -11,7 +11,7 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 // repo-root
 const blueprintPath = path.join(__dirname, '../..');
 
-export const SUPPORTED_PACKAGE_MANAGERS = ['npm', 'yarn', 'pnpm'] as const;
+export const SUPPORTED_PACKAGE_MANAGERS = ['npm', 'pnpm'] as const;
 
 export async function createTmp() {
   let prefix = 'v2-addon-blueprint--';