fix: current eslint (enums)

salesforcecli · Nov 15, 2023 · f834979 · f834979
1 parent 38a3ebf
commit f834979
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/commands/package/convert.ts b/src/commands/package/convert.ts
@@ -13,6 +13,7 @@ import {
   PackageEvents,
   PackageVersionCreateEventData,
   PackageVersionCreateRequestResult,
+  PackagingSObjects,
 } from '@salesforce/packaging';
 import { camelCaseToTitleCase, Duration } from '@salesforce/kit';
 import { requiredHubFlag } from '../../utils/hubFlag';
@@ -128,10 +129,10 @@ export class PackageConvert extends SfCommand<PackageVersionCreateRequestResult>
     );
 
     switch (result.Status) {
-      case 'Error':
+      case PackagingSObjects['Package2VersionStatus'].error:
         this.spinner.stop();
         throw new SfError(result.Error?.join('\n') ?? pvcMessages.getMessage('unknownError'));
-      case 'Success': {
+      case PackagingSObjects['Package2VersionStatus'].success: {
         const successMessage = pvcMessages.getMessage(result.Status, [
           result.Id,
           result.SubscriberPackageVersionId,

diff --git a/src/commands/package/version/create.ts b/src/commands/package/version/create.ts
@@ -243,11 +243,11 @@ export class PackageVersionCreateCommand extends SfCommand<PackageVersionCommand
     }
 
     switch (result.Status) {
-      case 'Error':
+      case Package2VersionStatus.error:
         throw messages.createError('multipleErrors', [
           result.Error?.map((e: string, i) => `${os.EOL}(${i + 1}) ${e}`).join(''),
         ]);
-      case 'Success':
+      case Package2VersionStatus.success:
         this.log(
           messages.getMessage(result.Status, [
             result.Id,

diff --git a/test/commands/package/packageVersion.nut.ts b/test/commands/package/packageVersion.nut.ts
@@ -114,14 +114,15 @@ describe('package:version:*', () => {
       const project = await SfProject.resolve();
       const projectJson = project.getSfProjectJson();
       const contents = projectJson.getContents();
-      const packageDir = contents.packageDirectories.find((pkgDir) => pkgDir.package === pkgName);
-      if (packageDir) {
-        packageDir.package = packageId;
-      } else {
+      if (!contents.packageDirectories.some((pkgDir) => pkgDir.package === packageId)) {
         expect.fail('packageDirectory not found');
       }
-      projectJson.setContents(contents);
-      projectJson.writeSync(contents);
+      const newPackageDirs = contents.packageDirectories.map((pkgDir) =>
+        pkgDir.package === pkgName ? { ...pkgDir, package: packageId } : pkgDir
+      );
+
+      projectJson.set('packageDirectories', newPackageDirs);
+      projectJson.writeSync();
       execCmd(`package:version:create --package ${packageId} -x --json`, { ensureExitCode: 0 });
     });
   });