@salesforce/cli-plugins-testkit 2.3.7 → 2.3.10

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.3.10](https://github.com/salesforcecli/cli-plugins-testkit/compare/v2.3.9...v2.3.10) (2022-08-02)
+
+### [2.3.9](https://github.com/salesforcecli/cli-plugins-testkit/compare/v2.3.8...v2.3.9) (2022-08-02)
+
+### [2.3.8](https://github.com/salesforcecli/cli-plugins-testkit/compare/v2.3.7...v2.3.8) (2022-08-02)
+
 ### [2.3.7](https://github.com/salesforcecli/cli-plugins-testkit/compare/v2.3.6...v2.3.7) (2022-08-02)
 
 ### [2.3.6](https://github.com/salesforcecli/cli-plugins-testkit/compare/v2.3.5...v2.3.6) (2022-08-01)

package/lib/execCmd.js

@@ -65,9 +65,8 @@ const getExitCodeError = (cmd, expectedCode, output) => {
  * @returns The command string with CLI executable. E.g., `"node_modules/bin/sfdx force:user:create -a testuser1"`
  */
 const buildCmd = (cmdArgs, options) => {
-    var _a;
     const debug = (0, debug_1.default)('testkit:buildCmd');
-    const bin = (_a = kit_1.env.getString('TESTKIT_EXECUTABLE_PATH')) !== null && _a !== void 0 ? _a : (0, path_1.join)('bin', 'dev');
+    const bin = kit_1.env.getString('TESTKIT_EXECUTABLE_PATH') ?? (0, path_1.join)('bin', 'dev');
     const which = shelljs.which(bin);
     let resolvedPath = (0, path_1.resolve)(bin);
     // If which finds the path in the system path, use that.
@@ -79,7 +78,7 @@ const buildCmd = (cmdArgs, options) => {
     }
     debug(`Using executable path: ${bin}`);
     debug(`Resolved executable path: ${resolvedPath}`);
-    if ((options === null || options === void 0 ? void 0 : options.answers) && process.platform !== 'win32') {
+    if (options?.answers && process.platform !== 'win32') {
         return `printf "${options.answers.join('\\n')}" | ${bin} ${cmdArgs}`;
     }
     else {

package/lib/testProject.js

@@ -40,7 +40,7 @@ class TestProject {
             this.shelljsExecOptions.shell = shellOverride;
         }
         // Copy a dir containing a SFDX project to a dir for testing.
-        if (options === null || options === void 0 ? void 0 : options.sourceDir) {
+        if (options?.sourceDir) {
             const rv = shell.cp('-r', options.sourceDir, destDir);
             if (rv.code !== 0) {
                 throw new Error(`project copy failed with error:\n${rv.stderr}`);
@@ -48,7 +48,7 @@ class TestProject {
             this.dir = path.join(destDir, path.basename(options.sourceDir));
         }
         // Clone a git repo containing a SFDX project in a dir for testing.
-        else if (options === null || options === void 0 ? void 0 : options.gitClone) {
+        else if (options?.gitClone) {
             // verify git is found
             if (!shell.which('git')) {
                 throw new Error('git executable not found for creating a project from a git clone');
@@ -87,8 +87,8 @@ class TestProject {
      * @returns The created zip file path.
      */
     async zip(name, destDir) {
-        name !== null && name !== void 0 ? name : (name = `${path.basename(this.dir)}.zip`);
-        destDir !== null && destDir !== void 0 ? destDir : (destDir = path.dirname(this.dir));
+        name ?? (name = `${path.basename(this.dir)}.zip`);
+        destDir ?? (destDir = path.dirname(this.dir));
         return this.zipDir({ name, sourceDir: this.dir, destDir });
     }
 }

package/lib/testSession.js

@@ -146,13 +146,12 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
      */
     async zip(name, destDir) {
         if (kit_1.env.getBoolean('TESTKIT_ENABLE_ZIP')) {
-            name !== null && name !== void 0 ? name : (name = `${path.basename(this.dir)}.zip`);
-            destDir !== null && destDir !== void 0 ? destDir : (destDir = path.dirname(this.dir));
+            name ?? (name = `${path.basename(this.dir)}.zip`);
+            destDir ?? (destDir = path.dirname(this.dir));
             return this.zipDir({ name, sourceDir: this.dir, destDir });
         }
     }
     async init() {
-        var _a;
         // Run all setup commands
         await this.setupCommands(this.options.setupCommands);
         this.debug('Created testkit session:');
@@ -160,7 +159,7 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
         this.debug(`  Created Date: ${this.createdDate}`);
         this.debug(`  Dir: ${this.dir}`);
         this.debug(`  Home Dir: ${this.homeDir}`);
-        if ((_a = this.orgs) === null || _a === void 0 ? void 0 : _a.length) {
+        if (this.orgs?.length) {
             this.debug('  Orgs: ', this.orgs);
         }
         if (this.project) {
@@ -168,8 +167,7 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
         }
     }
     async deleteOrgs() {
-        var _a;
-        if (!kit_1.env.getString('TESTKIT_ORG_USERNAME') && ((_a = this.orgs) === null || _a === void 0 ? void 0 : _a.length)) {
+        if (!kit_1.env.getString('TESTKIT_ORG_USERNAME') && this.orgs?.length) {
             const orgs = this.orgs.slice();
             for (const org of orgs) {
                 this.debug(`Deleting test org: ${org}`);
@@ -195,7 +193,6 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
     // Executes commands and keeps track of any orgs created.
     // Throws if any commands return a non-zero exitCode.
     async setupCommands(cmds) {
-        var _a;
         const dbug = (0, debug_1.debug)('testkit:setupCommands');
         const setup = () => {
             if (cmds) {
@@ -256,7 +253,7 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
         };
         let attempts = 0;
         let completed = false;
-        const timeout = new kit_1.Duration((_a = kit_1.env.getNumber('TESTKIT_SETUP_RETRIES_TIMEOUT')) !== null && _a !== void 0 ? _a : 5000, kit_1.Duration.Unit.MILLISECONDS);
+        const timeout = new kit_1.Duration(kit_1.env.getNumber('TESTKIT_SETUP_RETRIES_TIMEOUT') ?? 5000, kit_1.Duration.Unit.MILLISECONDS);
         while (!completed && attempts <= this.setupRetries) {
             try {
                 dbug(`Executing setup commands (attempt ${attempts + 1} of ${this.setupRetries + 1})`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/cli-plugins-testkit",
   "description": "Provides test utilities to assist Salesforce CLI plug-in authors with writing non-unit tests (NUT).",
-  "version": "2.3.7",
+  "version": "2.3.10",
   "author": "Salesforce",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",