@salesforce/cli-plugins-testkit 2.0.1 → 2.1.2

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.1.2](https://github.com/salesforcecli/cli-plugins-testkit/compare/v2.1.1...v2.1.2) (2022-06-02)
+
+### Bug Fixes
+
+- clear globalInfo instance after every possible touchpoint ([ca7dc01](https://github.com/salesforcecli/cli-plugins-testkit/commit/ca7dc012496ec207649e0ef48a6d1fef2ec94f8d))
+
+### [2.1.1](https://github.com/salesforcecli/cli-plugins-testkit/compare/v2.1.0...v2.1.1) (2022-06-02)
+
+## [2.1.0](https://github.com/salesforcecli/cli-plugins-testkit/compare/v2.0.1...v2.1.0) (2022-06-01)
+
+### Features
+
+- native node delete retries ([e4b336f](https://github.com/salesforcecli/cli-plugins-testkit/commit/e4b336f78f57ec1b43daa302c5b4eb2c1fe685c5))
+
 ### [2.0.1](https://github.com/salesforcecli/cli-plugins-testkit/compare/v2.0.0...v2.0.1) (2022-06-01)
 
 ## [2.0.0](https://github.com/salesforcecli/cli-plugins-testkit/compare/v1.5.35...v2.0.0) (2022-05-31)

package/lib/hubAuth.js

@@ -12,6 +12,7 @@ const os = require("os");
 const fs = require("fs");
 const shell = require("shelljs");
 const debug_1 = require("debug");
+const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 // this seems to be a known eslint error for enums
 // eslint-disable-next-line no-shadow
@@ -86,6 +87,7 @@ const testkitHubAuth = (homeDir, authStrategy = getAuthStrategy()) => {
         logger('trying jwt auth');
         const jwtKey = (0, exports.prepareForJwt)(homeDir);
         const results = shell.exec(`sfdx auth:jwt:grant -d -u ${kit_1.env.getString('TESTKIT_HUB_USERNAME', '')} -i ${kit_1.env.getString('TESTKIT_JWT_CLIENT_ID', '')} -f ${jwtKey} -r ${kit_1.env.getString('TESTKIT_HUB_INSTANCE', DEFAULT_INSTANCE_URL)}`, execOpts);
+        core_1.GlobalInfo.clearInstance();
         if (results.code !== 0) {
             throw new Error(`jwt:grant for org ${kit_1.env.getString('TESTKIT_HUB_USERNAME', 'TESTKIT_HUB_USERNAME was not set')} failed with exit code: ${results.code}\n ${results.stdout + results.stderr}`);
         }
@@ -95,6 +97,7 @@ const testkitHubAuth = (homeDir, authStrategy = getAuthStrategy()) => {
         logger('trying to authenticate with AuthUrl');
         const tmpUrl = (0, exports.prepareForAuthUrl)(homeDir);
         const shellOutput = shell.exec(`sfdx auth:sfdxurl:store -d -f ${tmpUrl}`, execOpts);
+        core_1.GlobalInfo.clearInstance();
         logger(shellOutput);
         if (shellOutput.code !== 0) {
             throw new Error(`auth:sfdxurl for url ${tmpUrl} failed with exit code: ${shellOutput.code}\n ${shellOutput.stdout + shellOutput.stderr}`);
@@ -158,6 +161,7 @@ const transferExistingAuthToEnv = (authStrategy = getAuthStrategy()) => {
         // this is an org from web:auth or auth:url.  Generate the authUrl and set in the env
         logger('copying variables to env from org:display for AuthUrl');
         const displayContents = JSON.parse(shell.exec(`sfdx force:org:display -u ${devhub} --verbose --json`, execOpts));
+        core_1.GlobalInfo.clearInstance();
         logger(`found ${displayContents.result.sfdxAuthUrl}`);
         kit_1.env.setString('TESTKIT_AUTH_URL', displayContents.result.sfdxAuthUrl);
         return;

package/lib/testSession.js

@@ -10,6 +10,7 @@ exports.TestSession = void 0;
 const fs = require("fs");
 const path = require("path");
 const debug_1 = require("debug");
+const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const sinon_1 = require("sinon");
@@ -182,6 +183,7 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
                 }
                 this.debug('Deleted org result=', rv.stdout);
             }
+            core_1.GlobalInfo.clearInstance();
         }
     }
     async rmSessionDir() {
@@ -190,7 +192,7 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
             return;
         }
         this.debug(`Deleting test session dir: ${this.dir}`);
-        return fs.promises.rm(this.dir, { recursive: true, force: true });
+        return fs.promises.rm(this.dir, { recursive: true, force: true, maxRetries: 100, retryDelay: 2000 });
     }
     // Executes commands and keeps track of any orgs created.
     // Throws if any commands return a non-zero exitCode.
@@ -273,6 +275,8 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
                 await this.sleep(timeout);
             }
         }
+        // there may be globalInfo touches from org:create or other setup commands run
+        core_1.GlobalInfo.clearInstance();
     }
     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": "2.0.1",
+  "version": "2.1.2",
   "author": "Salesforce",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",