@salesforce/cli-plugins-testkit 3.0.2 → 3.1.0

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>>;

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?;
@@ -80,6 +81,7 @@ export declare class TestSession extends AsyncOptionalCreatable<TestSessionOptio
     private zipDir;
     private options;
     private shelljsExecOptions;
+    private orgsAliases;
     constructor(options?: TestSessionOptions);
     /**
      * Get an existing test session created with the same options,

package/lib/testSession.js

@@ -54,6 +54,7 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
         this.shelljsExecOptions = {
             silent: true,
         };
+        this.orgsAliases = ['default'];
         this.options = options;
         this.debug = (0, debug_1.debug)('testkit:session');
         this.zipDir = zip_1.zipDir;
@@ -93,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,
@@ -167,7 +178,7 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
     async deleteOrgs() {
         if (!kit_1.env.getString('TESTKIT_ORG_USERNAME') && this.orgs.size > 0) {
             for (const org of [...this.orgs.keys()]) {
-                if (org === 'default')
+                if (this.orgsAliases.includes(org))
                     continue;
                 this.debug(`Deleting test org: ${org}`);
                 const rv = shell.exec(`sf env delete scratch -o ${org} -p`, this.shelljsExecOptions);
@@ -245,6 +256,10 @@ class TestSession extends kit_1.AsyncOptionalCreatable {
                 if (org.setDefault) {
                     this.orgs.set('default', jsonOutput.result.authFields);
                 }
+                if (org.alias) {
+                    this.orgsAliases.push(org.alias);
+                    this.orgs.set(org.alias, jsonOutput.result.authFields);
+                }
             }
         };
         let attempts = 0;

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