test(nuts): get default hub from current session

Author: cristiand391

test/nut/commands/force/org/org.nut.ts

@@ -9,7 +9,9 @@ import * as querystring from 'querystring';
 import { expect } from '@salesforce/command/lib/test';
 import { TestSession } from '@salesforce/cli-plugins-testkit';
 import { execCmd } from '@salesforce/cli-plugins-testkit';
-import { asDictionary, AnyJson, Dictionary, getString, isArray } from '@salesforce/ts-types';
+import { asDictionary, AnyJson, Dictionary, getString, isArray, ensureString } from '@salesforce/ts-types';
+
+let hubOrgUsername: string;
 
 const verifyHumanResults = (
   lines: string[],
@@ -18,7 +20,7 @@ const verifyHumanResults = (
   verbose = false
 ): void => {
   expect(lines.length).to.have.greaterThan(0);
-  const devHubLine = lines.find((line) => line.includes(process.env.TESTKIT_HUB_USERNAME));
+  const devHubLine = lines.find((line) => line.includes(hubOrgUsername));
   expect(devHubLine).to.be.ok;
   expect(devHubLine).to.include('(D)');
   expect(devHubLine).to.include('Connected');
@@ -44,15 +46,26 @@ describe('Org Command NUT', () => {
   let aliasedUsername: string;
   let defaultUserOrgId: string;
   let aliasUserOrgId: string;
+
   before(async () => {
     session = await TestSession.create({
       project: { name: 'forceOrgList' },
       setupCommands: [
         'sfdx force:org:create -f config/project-scratch-def.json --setdefaultusername --wait 10',
         'sfdx force:org:create -f config/project-scratch-def.json --setalias anAlias --wait 10',
+        'sfdx config:get defaultdevhubusername --json',
       ],
     });
 
+    // get default devhub username
+    if (isArray<AnyJson>(session.setup)) {
+      hubOrgUsername = ensureString(
+        (session.setup[2] as { result: [{ key: string; value: string }] }).result.find(
+          (config) => config.key === 'defaultdevhubusername'
+        )?.value
+      );
+    }
+
     if (isArray<AnyJson>(session.setup)) {
       defaultUsername = getString(session.setup[0], 'result.username');
       defaultUserOrgId = getString(session.setup[0], 'result.orgId');
@@ -89,7 +102,7 @@ describe('Org Command NUT', () => {
       });
       expect(nonScratchOrgs).to.include(
         {
-          username: process.env.TESTKIT_HUB_USERNAME,
+          username: hubOrgUsername,
           defaultMarker: '(D)',
           isDevHub: true,
           connectedStatus: 'Connected',
@@ -103,7 +116,7 @@ describe('Org Command NUT', () => {
       const nonScratchOrgs = asDictionary(listResult.nonScratchOrgs[0]);
       expect(nonScratchOrgs).to.include(
         {
-          username: process.env.TESTKIT_HUB_USERNAME,
+          username: hubOrgUsername,
           defaultMarker: '(D)',
           isDevHub: true,
         },
@@ -124,7 +137,7 @@ describe('Org Command NUT', () => {
       const result = execCmd<Dictionary>('force:org:display --json', { ensureExitCode: 0 }).jsonOutput.result;
       expect(result).to.be.ok;
       expect(result).to.include({
-        devHubId: process.env.TESTKIT_HUB_USERNAME,
+        devHubId: hubOrgUsername,
         username: defaultUsername,
       });
     });
@@ -133,7 +146,7 @@ describe('Org Command NUT', () => {
         .jsonOutput.result;
       expect(result).to.be.ok;
       expect(result).to.include({
-        devHubId: process.env.TESTKIT_HUB_USERNAME,
+        devHubId: hubOrgUsername,
         username: aliasedUsername,
       });
     });

test/nut/commands/force/org/sandbox.sandboxNut.ts

@@ -6,18 +6,30 @@
  */
 import { execCmd, TestSession } from '@salesforce/cli-plugins-testkit';
 import { Lifecycle, Messages, SandboxEvents, SandboxProcessObject, StatusEvent } from '@salesforce/core';
+import { isArray, AnyJson, ensureString } from '@salesforce/ts-types';
 import { expect } from 'chai';
 
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('@salesforce/plugin-org', 'create');
 
+let hubOrgUsername: string;
+
 describe('Sandbox Orgs', () => {
   let session: TestSession;
 
   before(async () => {
     session = await TestSession.create({
+      setupCommands: ['sfdx config:get defaultdevhubusername --json'],
       project: { name: 'sandboxCreate' },
     });
+    // get default devhub username
+    if (isArray<AnyJson>(session.setup)) {
+      hubOrgUsername = ensureString(
+        (session.setup[0] as { result: [{ key: string; value: string }] }).result.find(
+          (config) => config.key === 'defaultdevhubusername'
+        )?.value
+      );
+    }
   });
 
   it('will create a sandbox, verify it can be opened, and then attempt to delete it', async () => {
@@ -29,7 +41,7 @@ describe('Sandbox Orgs', () => {
       });
       result = execCmd<SandboxProcessObject>(
         // TODO: revert to org:create once out of beta
-        `force:org:beta:create -a mySandbox -t sandbox -s licenseType='Developer' -w 60 -u ${process.env.TESTKIT_HUB_USERNAME} --json`,
+        `force:org:beta:create -a mySandbox -t sandbox -s licenseType='Developer' -w 60 -u ${hubOrgUsername} --json`,
         { timeout: 3600000 }
       ).jsonOutput.result;
       // autogenerated sandbox names start with 'sbx'
@@ -41,7 +53,7 @@ describe('Sandbox Orgs', () => {
       expect(e.message, 'org:create DNS issue').to.include(messages.getMessage('dnsTimeout'));
       expect(e.exitCode, 'org:create DNS issue').to.equal(68);
     }
-    const sandboxUsername = `${process.env.TESTKIT_HUB_USERNAME}.${result.SandboxName}`;
+    const sandboxUsername = `${hubOrgUsername}.${result.SandboxName}`;
     // even if a DNS issue occurred, the sandbox should still be present and available.
     const openResult = execCmd<{ username: string }>('force:org:open -u mySandbox --urlonly --json', {
       ensureExitCode: 0,

test/nut/commands/force/org/status.sandboxNut.ts

@@ -10,11 +10,11 @@ import { TestSession, execCmd } from '@salesforce/cli-plugins-testkit';
 import { expect } from 'chai';
 import * as shell from 'shelljs';
 import { AuthInfo, Connection, SandboxProcessObject } from '@salesforce/core';
-import { Env } from '@salesforce/kit';
-import { ensureString } from '@salesforce/ts-types';
+import { isArray, AnyJson, ensureString } from '@salesforce/ts-types';
 
 let session: TestSession;
 let sandboxName: string;
+let hubOrgUsername: string;
 
 function unsetAlias() {
   const execOptions: shell.ExecOptions = {
@@ -41,20 +41,25 @@ function logoutSandbox(username: string) {
 }
 
 describe('test sandbox status command', () => {
-  const env = new Env();
-  let username: string;
-
   before(async () => {
     session = await TestSession.create({
+      setupCommands: ['sfdx config:get defaultdevhubusername --json'],
       project: {
         sourceDir: path.join(process.cwd(), 'test', 'nut', 'commands', 'force', 'org'),
       },
     });
-    username = ensureString(env.getString('TESTKIT_HUB_USERNAME'));
+    // get default devhub username
+    if (isArray<AnyJson>(session.setup)) {
+      hubOrgUsername = ensureString(
+        (session.setup[0] as { result: [{ key: string; value: string }] }).result.find(
+          (config) => config.key === 'defaultdevhubusername'
+        )?.value
+      );
+    }
     const queryStr =
       "SELECT SandboxName FROM SandboxProcess WHERE Status != 'E' and Status != 'D' ORDER BY CreatedDate DESC LIMIT 1";
     const connection = await Connection.create({
-      authInfo: await AuthInfo.create({ username }),
+      authInfo: await AuthInfo.create({ username: hubOrgUsername }),
     });
     const queryResult = (await connection.tooling.query(queryStr)) as { records: SandboxProcessObject[] };
     expect(queryResult?.records?.length).to.equal(1);
@@ -64,12 +69,12 @@ describe('test sandbox status command', () => {
   afterEach(() => {
     unsetAlias();
     unsetConfig();
-    logoutSandbox(username);
+    logoutSandbox(hubOrgUsername);
   });
 
   it('sandbox status command', async () => {
     const orgStatusResult = execCmd<SandboxProcessObject>(
-      `force:org:status --sandboxname ${sandboxName} -u ${username} --json`,
+      `force:org:status --sandboxname ${sandboxName} -u ${hubOrgUsername} --json`,
       {
         ensureExitCode: 0,
       }
@@ -93,7 +98,7 @@ describe('test sandbox status command', () => {
 
   it('sandbox status command sets setdefaultusername', async () => {
     const orgStatusResult = execCmd<SandboxProcessObject>(
-      `force:org:status --sandboxname ${sandboxName} -u ${username} -s --json`,
+      `force:org:status --sandboxname ${sandboxName} -u ${hubOrgUsername} -s --json`,
       {
         ensureExitCode: 0,
       }
@@ -104,12 +109,12 @@ describe('test sandbox status command', () => {
     };
     const result = shell.exec('sfdx config:get defaultusername --json', execOptions) as shell.ShellString;
     expect(result.code).to.equal(0);
-    expect(result.stdout).to.contain(`"${username}.${sandboxName}"`);
+    expect(result.stdout).to.contain(`"${hubOrgUsername}.${sandboxName}"`);
   });
 
   it('sandbox status command set alias', async () => {
     const orgStatusResult = execCmd<SandboxProcessObject>(
-      `force:org:status --sandboxname ${sandboxName} -u ${username} -a ${sandboxName} --json`,
+      `force:org:status --sandboxname ${sandboxName} -u ${hubOrgUsername} -a ${sandboxName} --json`,
       {
         ensureExitCode: 0,
       }