Skip to content

Commit 5654f9e

Browse files
committed
feat: uses default username
1 parent bc815da commit 5654f9e

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/commands/force/org/display.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@ export class OrgDisplayCommand extends SfdxCommand {
2828

2929
public async run(): Promise<OrgDisplayReturn> {
3030
// translate to alias if necessary
31-
const username =
32-
(await Aliases.fetch(this.flags.targetusername)) ??
33-
(this.flags.targetusername as string) ??
34-
this.org.getUsername();
31+
const username = (await Aliases.fetch(this.org.getUsername())) ?? this.org.getUsername();
3532
const authInfo = await AuthInfo.create({ username });
3633
const fields = authInfo.getFields(true);
3734

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ describe('org:display', () => {
4848

4949
beforeEach(async function () {
5050
$$.SANDBOX.restore();
51-
stubMethod($$.SANDBOX, Aliases, 'fetch').withArgs('nonscratchalias').resolves('[email protected]');
51+
stubMethod($$.SANDBOX, Aliases, 'fetch')
52+
.withArgs('nonscratchalias')
53+
.resolves('[email protected]')
54+
.withArgs('scratchAlias')
55+
.resolves('[email protected]');
5256
stubMethod($$.SANDBOX, utils, 'getAliasByUsername')
5357
.withArgs('[email protected]')
5458
.resolves('nonscratchalias')
@@ -203,6 +207,8 @@ describe('org:display', () => {
203207
devHubUsername: devHub.username,
204208
});
205209
stubMethod($$.SANDBOX, Org, 'create').resolves(Org.prototype);
210+
stubMethod($$.SANDBOX, Org.prototype, 'getUsername').returns('[email protected]');
211+
206212
stubMethod($$.SANDBOX, Org.prototype, 'getOrgId').resolves(devHub.id);
207213
stubMethod($$.SANDBOX, Org.prototype, 'getDevHubOrg').resolves({
208214
getUsername: () => devHub.username,
@@ -227,7 +233,6 @@ describe('org:display', () => {
227233
.stdout()
228234
.command(['force:org:display', '--targetusername', '[email protected]', '--json'])
229235
.it('queries server for scratch org info', (ctx) => {
230-
// console.log(ctx.stdout);
231236
const result = JSON.parse(ctx.stdout).result;
232237
expect(result).to.not.be.undefined;
233238
expect(result.status).to.equal('Active');

0 commit comments

Comments
 (0)