@salesforce/cli-plugins-testkit 3.1.2 → 3.2.1

package/lib/hubAuth.js

@@ -131,7 +131,7 @@ const transferExistingAuthToEnv = (authStrategy) => {
     const devhub = kit_1.env.getString('TESTKIT_HUB_USERNAME', '');
     logger(`reading ${devhub}.json`);
     const authFileName = `${devhub}.json`;
-    const hubAuthFileSource = path.join(kit_1.env.getString('HOME') || os.homedir(), '.sfdx', authFileName);
+    const hubAuthFileSource = path.join(kit_1.env.getString('HOME') ?? os.homedir(), '.sfdx', authFileName);
     const authFileContents = JSON.parse(fs.readFileSync(hubAuthFileSource, 'utf-8'));
     if (authFileContents.privateKey) {
         logger('copying variables to env from AuthFile for JWT');

package/lib/testProject.js

@@ -34,7 +34,7 @@ class TestProject {
         this.debug(`Creating TestProject with options: ${(0, util_1.inspect)(options)}`);
         this.zipDir = zip_1.zipDir;
         this.createdDate = new Date();
-        const destDir = options.destinationDir || (0, os_1.tmpdir)();
+        const destDir = options.destinationDir ?? (0, os_1.tmpdir)();
         const shellOverride = kit_1.env.getString('TESTKIT_EXEC_SHELL');
         if (shellOverride) {
             this.shelljsExecOptions.shell = shellOverride;
@@ -70,7 +70,7 @@ class TestProject {
             if (!shell.which('sfdx')) {
                 throw new Error('sfdx executable not found for creating a project using force:project:create command');
             }
-            const name = options.name || (0, genUniqueString_1.genUniqueString)('project_%s');
+            const name = options.name ?? (0, genUniqueString_1.genUniqueString)('project_%s');
             const rv = shell.exec(`sfdx force:project:create -n ${name} -d ${destDir}`, this.shelljsExecOptions);
             if (rv.code !== 0) {
                 throw new Error(`force:project:create failed with error:\n${rv.stderr}`);

package/lib/testSession.js

@@ -60,14 +60,14 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
         this.zipDir = zip_1.zipDir;
         this.createdDate = new Date();
         this.id = (0, genUniqueString_1.genUniqueString)(`${this.createdDate.valueOf()}%s`);
-        this.retries = kit_1.env.getNumber('TESTKIT_SETUP_RETRIES', this.options.retries) || 0;
+        this.retries = kit_1.env.getNumber('TESTKIT_SETUP_RETRIES', this.options.retries) ?? 0;
         const shellOverride = kit_1.env.getString('TESTKIT_EXEC_SHELL');
         if (shellOverride) {
             this.shelljsExecOptions.shell = shellOverride;
         }
         // Create the test session directory
-        this.overriddenDir = kit_1.env.getString('TESTKIT_SESSION_DIR') || this.options.sessionDir;
-        this.dir = this.overriddenDir || path.join(process.cwd(), `test_session_${this.id}`);
+        this.overriddenDir = kit_1.env.getString('TESTKIT_SESSION_DIR') ?? this.options.sessionDir;
+        this.dir = this.overriddenDir ?? path.join(process.cwd(), `test_session_${this.id}`);
         fs.mkdirSync(this.dir, { recursive: true });
         // Setup a test project and stub process.cwd to be the project dir
         if (this.options.project) {
@@ -185,6 +185,7 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
                 this.orgs.delete(org);
                 if (rv.code !== 0) {
                     // Must still delete the session dir if org:delete fails
+                    // eslint-disable-next-line no-await-in-loop
                     await this.rmSessionDir();
                     throw Error(`Deleting org ${org} failed due to: ${rv.stderr}`);
                 }
@@ -244,6 +245,9 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
                 if (org.wait) {
                     baseCmd += ` -w ${org.wait}`;
                 }
+                else {
+                    baseCmd += ' -w 60';
+                }
                 const rv = shell.exec(baseCmd, this.shelljsExecOptions);
                 rv.stdout = stripAnsi(rv.stdout);
                 rv.stderr = stripAnsi(rv.stderr);
@@ -279,11 +283,15 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
                     throw err;
                 }
                 dbug(`Setup failed. waiting ${timeout.seconds} seconds before next attempt...`);
+                // eslint-disable-next-line no-await-in-loop
                 await this.deleteOrgs();
+                // eslint-disable-next-line no-await-in-loop
                 await this.sleep(timeout);
             }
         }
     }
+    // used for test spy/stub
+    // eslint-disable-next-line class-methods-use-this
     async sleep(duration) {
         await (0, kit_1.sleep)(duration);
     }

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": "3.1.2",
+  "version": "3.2.1",
   "author": "Salesforce",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",
@@ -42,7 +42,7 @@
     "!lib/**/*.map"
   ],
   "dependencies": {
-    "@salesforce/core": "^3.30.9",
+    "@salesforce/core": "^3.30.12",
     "@salesforce/kit": "^1.6.1",
     "@salesforce/ts-types": "^1.5.21",
     "@types/shelljs": "^0.8.11",
@@ -54,38 +54,32 @@
   },
   "devDependencies": {
     "@salesforce/dev-config": "^3.0.0",
-    "@salesforce/dev-scripts": "^2.0.0",
+    "@salesforce/dev-scripts": "^3.1.0",
     "@salesforce/prettier-config": "^0.0.2",
     "@salesforce/ts-sinon": "^1.4.0",
     "@types/archiver": "^5.1.0",
     "@types/debug": "^4.1.5",
-    "@typescript-eslint/eslint-plugin": "^4.26.0",
-    "@typescript-eslint/parser": "^4.26.0",
+    "@typescript-eslint/eslint-plugin": "^5.39.0",
+    "@typescript-eslint/parser": "^5.39.0",
     "chai": "^4.3.0",
-    "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^7.28.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-config-salesforce": "^0.1.6",
+    "eslint": "^8.21.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-salesforce": "^1.1.0",
     "eslint-config-salesforce-license": "^0.1.6",
-    "eslint-config-salesforce-typescript": "^0.2.7",
+    "eslint-config-salesforce-typescript": "^1.1.1",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-jsdoc": "^35.1.2",
-    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-jsdoc": "^39.3.6",
     "husky": "^7.0.4",
     "mocha": "^9.1.3",
     "nyc": "^15.1.0",
-    "prettier": "^2.3.1",
+    "prettier": "^2.7.1",
     "pretty-quick": "^3.1.0",
     "sinon": "10.0.0",
     "ts-node": "^10.0.0",
     "typescript": "^4.8.4"
   },
-  "config": {
-    "commitizen": {
-      "path": "cz-conventional-changelog"
-    }
-  },
+  "config": {},
   "publishConfig": {
     "access": "public"
   }