Merge pull request #26 from salesforcecli/org-display-get-defaultusername

Org display get defaultusername

Author: WillieRuemmele

src/commands/force/org/display.ts

@@ -7,7 +7,7 @@
 
 import * as os from 'os';
 import { flags, FlagsConfig, SfdxCommand } from '@salesforce/command';
-import { Aliases, AuthInfo, Messages, sfdc } from '@salesforce/core';
+import { AuthInfo, Messages, sfdc } from '@salesforce/core';
 
 import { OrgDisplayReturn, ScratchOrgFields } from '../../../shared/orgTypes';
 import { getAliasByUsername, camelCaseToTitleCase } from '../../../shared/utils';
@@ -28,8 +28,7 @@ export class OrgDisplayCommand extends SfdxCommand {
 
   public async run(): Promise<OrgDisplayReturn> {
     // translate to alias if necessary
-    const username = (await Aliases.fetch(this.flags.targetusername)) ?? (this.flags.targetusername as string);
-    const authInfo = await AuthInfo.create({ username });
+    const authInfo = await AuthInfo.create({ username: this.org.getUsername() });
     const fields = authInfo.getFields(true);
 
     const isScratchOrg = fields.devHubUsername;

test/commands/force/org/display.test.ts

@@ -48,7 +48,11 @@ describe('org:display', () => {
 
   beforeEach(async function () {
     $$.SANDBOX.restore();
-    stubMethod($$.SANDBOX, Aliases, 'fetch').withArgs('nonscratchalias').resolves('[email protected]');
+    stubMethod($$.SANDBOX, Aliases, 'fetch')
+      .withArgs('nonscratchalias')
+      .resolves('[email protected]')
+      .withArgs('scratchAlias')
+      .resolves('[email protected]');
     stubMethod($$.SANDBOX, utils, 'getAliasByUsername')
       .withArgs('[email protected]')
       .resolves('nonscratchalias')
@@ -203,6 +207,8 @@ describe('org:display', () => {
         devHubUsername: devHub.username,
       });
       stubMethod($$.SANDBOX, Org, 'create').resolves(Org.prototype);
+      stubMethod($$.SANDBOX, Org.prototype, 'getUsername').returns('[email protected]');
+
       stubMethod($$.SANDBOX, Org.prototype, 'getOrgId').resolves(devHub.id);
       stubMethod($$.SANDBOX, Org.prototype, 'getDevHubOrg').resolves({
         getUsername: () => devHub.username,
@@ -227,7 +233,6 @@ describe('org:display', () => {
     .stdout()
     .command(['force:org:display', '--targetusername', '[email protected]', '--json'])
     .it('queries server for scratch org info', (ctx) => {
-      // console.log(ctx.stdout);
       const result = JSON.parse(ctx.stdout).result;
       expect(result).to.not.be.undefined;
       expect(result.status).to.equal('Active');