test: fix moar UTs

Author: cristiand391

package.json

@@ -7,7 +7,7 @@
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
     "@oclif/core": "^1.7.0",
-    "@salesforce/command": "^5.1.0",
+    "@salesforce/command": "^5.1.3",
     "@salesforce/core": "^3.19.0",
     "@salesforce/kit": "^1.5.17",
     "open": "8.4.0",

src/commands/force/org/clone.ts

@@ -88,7 +88,7 @@ export class OrgCloneCommand extends SfdxCommand {
 
         if (results?.sandboxRes?.authUserName) {
           if (this.flags.setalias) {
-            const globalInfo = await GlobalInfo.create();
+            const globalInfo = await GlobalInfo.getInstance();
             globalInfo.aliases.set(this.flags.setalias, results.sandboxRes.authUserName);
             const result = globalInfo.aliases.getAll();
             this.logger.debug('Set Alias: %s result: %s', this.flags.setalias, result);

src/commands/force/org/open.ts

@@ -80,11 +80,7 @@ export class OrgOpenCommand extends SfdxCommand {
         const domain = `https://${/https?:\/\/([^.]*)/.exec(url)[1]}.lightning.force.com`;
         const timeout = new Duration(new Env().getNumber('SFDX_DOMAIN_RETRY', 240), Duration.Unit.SECONDS);
         this.logger.debug(`Did not find IP for ${domain} after ${timeout.seconds} seconds`);
-        throw new SfError(
-          messages.getMessage('domainTimeoutError', [messages.getMessage('domainTimeoutError')]),
-          'domainTimeoutError',
-          ['noOrgsFoundAction']
-        );
+        throw new SfError(messages.getMessage('domainTimeoutError'), 'domainTimeoutError');
       }
       throw SfError.wrap(err);
     }

test/commands/force/org/clone.test.ts

@@ -4,10 +4,11 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { Org, Aliases, Config, ConfigAggregator, Lifecycle, SandboxEvents } from '@salesforce/core';
+import { Org, Lifecycle, GlobalInfo, SandboxEvents, SfdxConfigAggregator, SfdxPropertyKeys } from '@salesforce/core';
 import { fromStub, stubInterface, stubMethod } from '@salesforce/ts-sinon';
 import * as sinon from 'sinon';
-import { expect, IConfig } from '@salesforce/command/lib/test';
+import { expect } from '@salesforce/command/lib/test';
+import { Config } from '@oclif/core';
 import { UX } from '@salesforce/command';
 import { OrgCloneCommand } from '../../../../src/commands/force/org/clone';
 
@@ -54,14 +55,14 @@ describe('org:clone', () => {
     retries: 0,
     waitingOnAuth: false,
   };
-  const oclifConfigStub = fromStub(stubInterface<IConfig.IConfig>(sandbox));
+  const oclifConfigStub = fromStub(stubInterface<Config>(sandbox));
 
   // stubs
   let uxTableStub: sinon.SinonStub;
   let uxStyledHeaderStub: sinon.SinonStub;
   let uxLogStub: sinon.SinonStub;
   let cmd: TestOrgCloneCommand;
-  let aliasSetStub: sinon.SinonStub;
+  let aliasSetStub: sinon.SinonSpy;
   let configSetStub: sinon.SinonStub;
   let configWriteStub: sinon.SinonStub;
   let onStub: sinon.SinonStub;
@@ -77,7 +78,7 @@ describe('org:clone', () => {
     public setOrg(org: Org) {
       this.org = org;
     }
-    public setConfigAggregator(configAggregator: ConfigAggregator) {
+    public setConfigAggregator(configAggregator: SfdxConfigAggregator) {
       this.configAggregator = configAggregator;
     }
   }
@@ -104,7 +105,7 @@ describe('org:clone', () => {
           write: configWriteStub,
         }),
       };
-      configAggregatorStub = fromStub(stubInterface<ConfigAggregator>(sandbox, configAggregatorStubOptions));
+      configAggregatorStub = fromStub(stubInterface<SfdxConfigAggregator>(sandbox, configAggregatorStubOptions));
       cmd.setConfigAggregator(configAggregatorStub);
     });
     if (!fails) {
@@ -122,7 +123,15 @@ describe('org:clone', () => {
     stubMethod(sandbox, Lifecycle, 'getInstance').returns({
       on: onStub,
     });
-    aliasSetStub = stubMethod(sandbox, Aliases.prototype, 'set').returns(sandboxalias);
+    aliasSetStub = sinon.spy();
+    stubMethod(sandbox, GlobalInfo, 'getInstance').returns({
+      aliases: {
+        set: aliasSetStub,
+        getAll: () => ({
+          sanboxname: sandboxalias,
+        }),
+      },
+    });
     uxTableStub = stubMethod(sandbox, UX.prototype, 'table');
     uxLogStub = stubMethod(sandbox, UX.prototype, 'log');
     uxStyledHeaderStub = stubMethod(sandbox, UX.prototype, 'styledHeader');
@@ -201,7 +210,7 @@ describe('org:clone', () => {
     expect(aliasSetStub.callCount).to.be.equal(1);
     expect(aliasSetStub.firstCall.args[0]).to.be.equal(sandboxalias);
     expect(aliasSetStub.firstCall.args[1]).to.be.equal(authUserName);
-    expect(configSetStub.firstCall.args[0]).to.be.equal(Config.DEFAULT_USERNAME);
+    expect(configSetStub.firstCall.args[0]).to.be.equal(SfdxPropertyKeys.DEFAULT_USERNAME);
     expect(configSetStub.firstCall.args[1]).to.be.equal(authUserName);
     expect(onStub.firstCall.firstArg).to.be.equal(SandboxEvents.EVENT_ASYNC_RESULT);
     expect(onStub.secondCall.firstArg).to.be.equal(SandboxEvents.EVENT_STATUS);

test/commands/force/org/delete.test.ts

@@ -7,7 +7,8 @@
 import { Messages, Org, SfProject } from '@salesforce/core';
 import { fromStub, stubInterface, stubMethod } from '@salesforce/ts-sinon';
 import * as sinon from 'sinon';
-import { expect, Config as IConfig } from '@salesforce/command/lib/test';
+import { expect } from '@salesforce/command/lib/test';
+import { Config } from '@oclif/core';
 import { UX } from '@salesforce/command';
 import { Delete } from '../../../../src/commands/force/org/delete';
 
@@ -18,7 +19,7 @@ describe('org:delete', () => {
   const sandbox = sinon.createSandbox();
   const username = '[email protected]';
   const orgId = '00D54000000KDltEAG';
-  const oclifConfigStub = fromStub(stubInterface<IConfig>(sandbox));
+  const oclifConfigStub = fromStub(stubInterface<Config>(sandbox));
 
   // stubs
   let resolveProjectConfigStub: sinon.SinonStub;

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

@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { expect, test } from '@salesforce/command/lib/test';
-import { Aliases, AuthInfo, Connection, Org } from '@salesforce/core';
+import { AuthInfo, Connection, Org } from '@salesforce/core';
 import * as sinon from 'sinon';
 import { stubMethod, stubInterface, StubbedType } from '@salesforce/ts-sinon';
 import * as utils from '../../../../src/shared/utils';
@@ -48,11 +48,6 @@ describe('org:display', () => {
   const sandbox = sinon.createSandbox();
 
   beforeEach(async function () {
-    stubMethod(sandbox, Aliases, 'fetch')
-      .withArgs('nonscratchalias')
-      .resolves('[email protected]')
-      .withArgs('scratchAlias')
-      .resolves('[email protected]');
     stubMethod(sandbox, utils, 'getAliasByUsername')
       .withArgs('[email protected]')
       .resolves('nonscratchalias')

test/commands/force/org/list.test.ts

@@ -21,7 +21,13 @@ import { OrgListUtil } from '../../../../src/shared/orgListUtil';
 describe('org_list', () => {
   const sandbox = sinon.createSandbox();
   beforeEach(async () => {
-    stubMethod(sandbox, AuthInfo, 'listAllAuthFiles');
+    stubMethod(sandbox, AuthInfo, 'listAllAuthorizations').resolves([
+      'Jimi Hendrix',
+      'SRV',
+      'shenderson',
+      'SRV',
+      '[email protected]',
+    ]);
   });
   afterEach(() => {
     sandbox.restore();

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

@@ -16,7 +16,8 @@ import {
 } from '@salesforce/core';
 import { fromStub, stubInterface, stubMethod } from '@salesforce/ts-sinon';
 import * as sinon from 'sinon';
-import { expect, Config as IConfig } from '@salesforce/command/lib/test';
+import { expect } from '@salesforce/command/lib/test';
+import { Config } from '@oclif/core';
 import { UX } from '@salesforce/command';
 import { OrgStatusCommand } from '../../../../src/commands/force/org/status';
 
@@ -51,7 +52,7 @@ describe('org:status', () => {
       loginUrl: 'https://my-login.com',
     },
   };
-  const oclifConfigStub = fromStub(stubInterface<IConfig>(sandbox));
+  const oclifConfigStub = fromStub(stubInterface<Config>(sandbox));
 
   // stubs
   let uxTableStub: sinon.SinonStub;

yarn.lock

@@ -719,6 +719,13 @@
   version "1.18.3"
   resolved "https://registry.yarnpkg.com/@oclif/config/-/config-1.18.3.tgz#ddfc144fdab66b1658c2f1b3478fa7fbfd317e79"
   integrity sha512-sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA==
+  dependencies:
+    "@oclif/errors" "^1.3.5"
+    "@oclif/parser" "^3.8.0"
+    debug "^4.1.1"
+    globby "^11.0.1"
+    is-wsl "^2.1.1"
+    tslib "^2.3.1"
 
 "@oclif/core@^1.0.8", "@oclif/core@^1.2.1", "@oclif/core@^1.3.4", "@oclif/core@^1.3.6", "@oclif/core@^1.6.4", "@oclif/core@^1.7.0":
   version "1.8.1"
@@ -755,40 +762,6 @@
     widest-line "^3.1.0"
     wrap-ansi "^7.0.0"
 
-"@oclif/core@^1.3.1":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-1.9.0.tgz#bb2a7820a9176f28921f449c0f577d39c15e74d0"
-  integrity sha512-duvlaRQf4JM+mKuwwos1DNa/Q9x6tnF3khV5RU0fy5hhETF7THlTmxioKlIvKMyQDVpySqtZXZ0OKHeCi2EWuQ==
-  dependencies:
-    "@oclif/linewrap" "^1.0.0"
-    "@oclif/screen" "^3.0.2"
-    ansi-escapes "^4.3.2"
-    ansi-styles "^4.3.0"
-    cardinal "^2.1.1"
-    chalk "^4.1.2"
-    clean-stack "^3.0.1"
-    cli-progress "^3.10.0"
-    debug "^4.3.4"
-    ejs "^3.1.6"
-    fs-extra "^9.1.0"
-    get-package-type "^0.1.0"
-    globby "^11.1.0"
-    hyperlinker "^1.0.0"
-    indent-string "^4.0.0"
-    is-wsl "^2.2.0"
-    js-yaml "^3.14.1"
-    natural-orderby "^2.0.3"
-    object-treeify "^1.1.33"
-    password-prompt "^1.1.2"
-    semver "^7.3.7"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-    supports-color "^8.1.1"
-    supports-hyperlinks "^2.2.0"
-    tslib "^2.3.1"
-    widest-line "^3.1.0"
-    wrap-ansi "^7.0.0"
-
 "@oclif/dev-cli@^1":
   version "1.26.10"
   resolved "https://registry.yarnpkg.com/@oclif/dev-cli/-/dev-cli-1.26.10.tgz#d8df3a79009b68552f5e7f249d1d19ca52278382"
@@ -950,14 +923,6 @@
   dependencies:
     fancy-test "^1.4.10"
 
-"@oclif/test@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@oclif/test/-/test-2.1.0.tgz#e5a0ba619c890770782e48c82d18f5921e2d2b9f"
-  integrity sha512-o+JTv3k28aMUxywJUlJY1/DORLqumoZFRII492phOmtXM16rD6Luy3z1qinT4BvEtPj2BzOPd2whr/VdYszaYw==
-  dependencies:
-    "@oclif/core" "^1.3.1"
-    fancy-test "^2.0.0"
-
 "@octokit/auth-token@^2.4.4":
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.5.0.tgz#27c37ea26c205f28443402477ffd261311f21e36"
@@ -1101,15 +1066,14 @@
     chalk "^2.4.2"
     cli-ux "^4.9.3"
 
-"@salesforce/command@^5.1.0":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@salesforce/command/-/command-5.1.2.tgz#934fa36679d8160512c4402705d0b8947a8b9d47"
-  integrity sha512-WbZlR1v/DYkO9Px5nBEexNrRK+aV9apC4rywyW92FTGrrNL9k6vjrf38JI18UuKuePFXzkQHUaz1/f99sC1bWA==
+"@salesforce/command@^5.1.3":
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/@salesforce/command/-/command-5.1.3.tgz#a55e9b8e746a5a68322f59a637f920470da6b51f"
+  integrity sha512-spVCcHh/SYM9L5oI52z+VSEOsAXgDxj6GTlEvkm+KPctsIUhtxS1xKzjeeVCuUmRmvfq5LgwtjcgTSIqkeoL9w==
   dependencies:
     "@oclif/core" "^1.7.0"
     "@oclif/plugin-help" "^5.1.11"
-    "@oclif/test" "^2.1.0"
-    "@salesforce/core" "^3.15.3"
+    "@salesforce/core" "^3.19.0"
     "@salesforce/kit" "^1.5.34"
     "@salesforce/ts-types" "^1.5.20"
     chalk "^2.4.2"
@@ -1138,7 +1102,7 @@
     semver "^7.3.5"
     ts-retry-promise "^0.6.0"
 
-"@salesforce/core@^3.15.3", "@salesforce/core@^3.19.0":
+"@salesforce/core@^3.19.0":
   version "3.19.0"
   resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-3.19.0.tgz#e238b07190623dc4e1ca1888c1185f5bfa2d383e"
   integrity sha512-64bz7cvfEkJz1JCMlf3W1CaWShoaINzfkrT6BQxtb5AdjZm5rs8Lmg3q6hie4hhWo3VVSvPOdnWEPpMJCdJ4/w==
@@ -3529,20 +3493,6 @@ fancy-test@^1.4.10:
     nock "^13.0.0"
     stdout-stderr "^0.1.9"
 
-fancy-test@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fancy-test/-/fancy-test-2.0.0.tgz#f1477ae4190820318816914aabe273c0a0dbd597"
-  integrity sha512-SFb2D/VX9SV+wNYXO1IIh1wyxUC1GS0mYCFJOWD1ia7MPj9yE2G8jaPkw4t/pg0Sj7/YJP56OzMY4nAuJSOugQ==
-  dependencies:
-    "@types/chai" "*"
-    "@types/lodash" "*"
-    "@types/node" "*"
-    "@types/sinon" "*"
-    lodash "^4.17.13"
-    mock-stdin "^1.0.0"
-    nock "^13.0.0"
-    stdout-stderr "^0.1.9"
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"