Derive a target specific app name

Author: kraenhansen

packages/compass-smoke-tests/src/build-info.ts

@@ -41,27 +41,65 @@ export const windowsFilenameKeys = [
   'windows_nupkg_full_filename',
 ] as const;
 export type WindowsBuildInfo = CommonBuildInfo &
-  Record<typeof windowsFilenameKeys[number], string>;
+  Record<typeof windowsFilenameKeys[number], string> & {
+    installerOptions: {
+      name: string;
+    };
+  };
 
 export function assertBuildInfoIsWindows(
   buildInfo: unknown
 ): asserts buildInfo is WindowsBuildInfo {
   assertObjectHasKeys(buildInfo, 'buildInfo', commonKeys);
   assertObjectHasKeys(buildInfo, 'buildInfo', windowsFilenameKeys);
+  assert(typeof buildInfo === 'object', 'Expected buildInfo to be an object');
+  assert(buildInfo !== null, 'Expected buildInfo to be an object');
+  assert(
+    'installerOptions' in buildInfo &&
+      typeof buildInfo.installerOptions === 'object',
+    'Expected buildInfo.installerOptions to be an object'
+  );
+  const { installerOptions } = buildInfo;
+  assert(
+    typeof installerOptions === 'object' &&
+      installerOptions !== null &&
+      'name' in installerOptions &&
+      typeof installerOptions.name === 'string',
+    'Expected buildInfo.installerOptions.name to be a string'
+  );
 }
 
 export const osxFilenameKeys = [
   'osx_dmg_filename',
   'osx_zip_filename',
 ] as const;
 export type OSXBuildInfo = CommonBuildInfo &
-  Record<typeof osxFilenameKeys[number], string>;
+  Record<typeof osxFilenameKeys[number], string> & {
+    installerOptions: {
+      title: string;
+    };
+  };
 
 export function assertBuildInfoIsOSX(
   buildInfo: unknown
 ): asserts buildInfo is OSXBuildInfo {
   assertObjectHasKeys(buildInfo, 'buildInfo', commonKeys);
   assertObjectHasKeys(buildInfo, 'buildInfo', osxFilenameKeys);
+  assert(typeof buildInfo === 'object', 'Expected buildInfo to be an object');
+  assert(buildInfo !== null, 'Expected buildInfo to be an object');
+  assert(
+    'installerOptions' in buildInfo &&
+      typeof buildInfo.installerOptions === 'object',
+    'Expected buildInfo.installerOptions to be an object'
+  );
+  const { installerOptions } = buildInfo;
+  assert(
+    typeof installerOptions === 'object' &&
+      installerOptions !== null &&
+      'title' in installerOptions &&
+      typeof installerOptions.title === 'string',
+    'Expected buildInfo.installerOptions.title to be a string'
+  );
 }
 
 export const ubuntuFilenameKeys = [
@@ -93,6 +131,7 @@ export type PackageDetails = {
   kind: PackageKind;
   filename: string;
   autoUpdatable: boolean;
+  appName: string;
 } & (
   | {
       kind: 'windows_setup' | 'windows_msi' | 'windows_zip';
@@ -129,6 +168,7 @@ export function getPackageDetails(
       kind,
       buildInfo,
       filename: buildInfo[`${kind}_filename`],
+      appName: buildInfo.installerOptions.name,
       autoUpdatable: kind === 'windows_setup',
     };
   } else if (kind === 'osx_dmg' || kind === 'osx_zip') {
@@ -137,6 +177,7 @@ export function getPackageDetails(
       kind,
       buildInfo,
       filename: buildInfo[`${kind}_filename`],
+      appName: buildInfo.installerOptions.title,
       autoUpdatable: true,
     };
   } else if (kind === 'linux_deb' || kind === 'linux_tar') {
@@ -145,6 +186,7 @@ export function getPackageDetails(
       kind,
       buildInfo,
       filename: buildInfo[`${kind}_filename`],
+      appName: buildInfo.productName,
       autoUpdatable: false,
     };
   } else if (kind === 'linux_rpm' || kind === 'rhel_tar') {
@@ -153,6 +195,7 @@ export function getPackageDetails(
       kind,
       buildInfo,
       filename: buildInfo[`${kind}_filename`],
+      appName: buildInfo.productName,
       autoUpdatable: false,
     };
   } else {

packages/compass-smoke-tests/src/cli.ts

@@ -175,12 +175,10 @@ async function run() {
     ])
   );
 
-  const { kind, buildInfo, filepath } = await getTestSubject(context);
+  const { kind, filepath, appName } = await getTestSubject(context);
   const install = getInstaller(kind);
 
   try {
-    const appName = buildInfo.productName;
-
     const { appPath, uninstall } = install({
       appName,
       filepath,
@@ -194,7 +192,7 @@ async function run() {
     }
   } finally {
     console.log('Cleaning up sandbox');
-    fs.rmSync(context.sandboxPath, { recursive: true });
+    // fs.rmSync(context.sandboxPath, { recursive: true });
   }
 }