@salesforce/cli-plugins-testkit 3.0.3 → 3.1.1

package/lib/execCmd.d.ts

@@ -22,7 +22,7 @@ export declare type ExecCmdOptions = ExecOptions & BaseExecOptions;
 declare type ExcludeMethods<T> = Pick<T, NonNullable<{
     [K in keyof T]: T[K] extends (_: any) => any ? never : K;
 }[keyof T]>>;
-declare type JsonOutput<T> = {
+export declare type JsonOutput<T> = {
     status: number;
     result: T;
 } & Partial<ExcludeMethods<SfError>>;
@@ -78,7 +78,8 @@ export declare enum Interaction {
     SELECT = " ",
     Yes = "Y\r",
     No = "N\r",
-    BACKSPACE = "\b"
+    BACKSPACE = "\b",
+    ALL = "a"
 }
 export declare type InteractiveCommandExecutionResult = {
     code: number | null;

package/lib/execCmd.js

@@ -170,6 +170,7 @@ var Interaction;
     Interaction["Yes"] = "Y\r";
     Interaction["No"] = "N\r";
     Interaction["BACKSPACE"] = "\b";
+    Interaction["ALL"] = "a";
 })(Interaction = exports.Interaction || (exports.Interaction = {}));
 /**
  * Execute an interactive command.

package/lib/hubAuth.js

@@ -76,7 +76,7 @@ const testkitHubAuth = (homeDir, authStrategy = (0, exports.getAuthStrategy)())
     if (authStrategy === 'JWT') {
         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);
+        const results = shell.exec(`sf login jwt org --set-default-dev-hub --username ${kit_1.env.getString('TESTKIT_HUB_USERNAME', '')} --clientid ${kit_1.env.getString('TESTKIT_JWT_CLIENT_ID', '')} --keyfile ${jwtKey} --instance-url ${kit_1.env.getString('TESTKIT_HUB_INSTANCE', DEFAULT_INSTANCE_URL)}`, execOpts);
         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}`);
         }

package/lib/testSession.d.ts

@@ -72,6 +72,7 @@ export declare class TestSession extends AsyncOptionalCreatable<TestSessionOptio
     project?: TestProject;
     rmRetryConfig: Partial<RetryConfig<void>>;
     orgs: Map<string, AuthFields>;
+    hubOrg: AuthFields;
     private debug;
     private cwdStub?;
     private overriddenDir?;

package/lib/testSession.js

@@ -94,6 +94,16 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
         process.env.USERPROFILE = process.env.HOME = this.homeDir = kit_1.env.getString('TESTKIT_HOMEDIR', this.dir);
         process.env.SFDX_USE_GENERIC_UNIX_KEYCHAIN = 'true';
         (0, hubAuth_1.testkitHubAuth)(this.homeDir, authStrategy);
+        if (authStrategy !== 'NONE') {
+            const config = shell.exec('sf config get target-dev-hub --json', this.shelljsExecOptions);
+            const configResults = JSON.parse(config.stdout);
+            const usernameOrAlias = configResults.result.find((org) => org.name === 'target-dev-hub')?.value;
+            if (usernameOrAlias) {
+                const displayEnv = shell.exec(`sf env display -e ${usernameOrAlias} --json`, this.shelljsExecOptions);
+                const displayEnvResults = JSON.parse(displayEnv.stdout);
+                this.hubOrg = displayEnvResults.result;
+            }
+        }
     }
     /**
      * Get an existing test session created with the same options,

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.0.3",
+  "version": "3.1.1",
   "author": "Salesforce",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",