@salesforce/cli-plugins-testkit 2.1.2 → 2.2.0

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 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.2.0](https://github.com/salesforcecli/cli-plugins-testkit/compare/v2.1.4...v2.2.0) (2022-06-08)
+
+### Features
+
+- core bump for cache fixes ([a8c890f](https://github.com/salesforcecli/cli-plugins-testkit/commit/a8c890ffacdf3d4e4f2ed67ed1f2ef3a5f0db9c3))
+
+### [2.1.4](https://github.com/salesforcecli/cli-plugins-testkit/compare/v2.1.3...v2.1.4) (2022-06-06)
+
+### Bug Fixes
+
+- remove StateAgg, handle when username and authurl are provided ([522ff33](https://github.com/salesforcecli/cli-plugins-testkit/commit/522ff33237e4d918343963d195ac3a298589ff0e))
+
+### [2.1.3](https://github.com/salesforcecli/cli-plugins-testkit/compare/v2.1.2...v2.1.3) (2022-06-06)
+
+### Bug Fixes
+
+- globalinfo -> stateAggregator ([6638739](https://github.com/salesforcecli/cli-plugins-testkit/commit/66387396d6aba5276cbadeb2d40fcc98182cd034))
+
 ### [2.1.2](https://github.com/salesforcecli/cli-plugins-testkit/compare/v2.1.1...v2.1.2) (2022-06-02)
 
 ### Bug Fixes

package/lib/hubAuth.js

@@ -12,7 +12,6 @@ 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
@@ -87,7 +86,6 @@ 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}`);
         }
@@ -97,7 +95,6 @@ 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}`);
@@ -113,13 +110,14 @@ const getAuthStrategy = () => {
         kit_1.env.getString('TESTKIT_JWT_KEY')) {
         return AuthStrategy.JWT;
     }
+    // you provided a username but not an auth url, so you must already have an auth that you want to re-use
+    if (kit_1.env.getString('TESTKIT_HUB_USERNAME') && !kit_1.env.getString('TESTKIT_AUTH_URL')) {
+        return AuthStrategy.REUSE;
+    }
+    // auth url alone
     if (kit_1.env.getString('TESTKIT_AUTH_URL')) {
         return AuthStrategy.AUTH_URL;
     }
-    // none of the above are included, so we want to reuse an already authenticated hub
-    if (kit_1.env.getString('TESTKIT_HUB_USERNAME')) {
-        return AuthStrategy.REUSE;
-    }
     return AuthStrategy.NONE;
 };
 /**
@@ -161,7 +159,6 @@ 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,7 +10,6 @@ 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");
@@ -183,7 +182,6 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
                 }
                 this.debug('Deleted org result=', rv.stdout);
             }
-            core_1.GlobalInfo.clearInstance();
         }
     }
     async rmSessionDir() {
@@ -275,8 +273,6 @@ 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.1.2",
+  "version": "2.2.0",
   "author": "Salesforce",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",
@@ -42,8 +42,8 @@
     "!lib/**/*.map"
   ],
   "dependencies": {
-    "@salesforce/core": "^3.19.1",
-    "@salesforce/kit": "^1.5.13",
+    "@salesforce/core": "^3.20.1",
+    "@salesforce/kit": "^1.5.42",
     "@salesforce/ts-types": "^1.5.17",
     "archiver": "^5.2.0",
     "debug": "^4.3.1",