Skip to content

Commit 8e94c00

Browse files
iowillhoitiowillhoit
authored
Merge pull request #645 from salesforcecli/sm/tweak-just-nuts
Sm/tweak-just-nuts
2 parents 4cddd3f + ddcd513 commit 8e94c00

File tree

4 files changed

+89
-53
lines changed

4 files changed

+89
-53
lines changed

‎package.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"@salesforce/core": "^3.34.6",
1111
"@salesforce/kit": "^1.9.2",
1212
"@salesforce/sf-plugins-core": "^2.2.7",
13-
"@salesforce/source-deploy-retrieve": "^7.15.0",
13+
"@salesforce/source-deploy-retrieve": "^8.0.1",
1414
"open": "^8.4.2",
1515
"tslib": "^2"
1616
},
@@ -24,12 +24,10 @@
2424
"@salesforce/prettier-config": "^0.0.2",
2525
"@salesforce/ts-sinon": "1.4.6",
2626
"@swc/core": "1.3.39",
27-
"@types/chai-as-promised": "^7.1.5",
2827
"@types/shelljs": "^0.8.10",
2928
"@typescript-eslint/eslint-plugin": "^5.57.0",
3029
"@typescript-eslint/parser": "^5.57.1",
3130
"chai": "^4.3.7",
32-
"chai-as-promised": "^7.1.1",
3331
"eslint": "^8.38.0",
3432
"eslint-config-prettier": "^8.6.0",
3533
"eslint-config-salesforce": "^1.1.1",
@@ -40,7 +38,7 @@
4038
"eslint-plugin-jsdoc": "^40.0.3",
4139
"eslint-plugin-sf-plugin": "^1.14.0",
4240
"husky": "^7.0.4",
43-
"mocha": "^9.1.3",
41+
"mocha": "^10.2.0",
4442
"moment": "^2.29.1",
4543
"nyc": "^15.1.0",
4644
"oclif": "^3.7.3",

‎test/nut/open.nut.ts‎

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import * as path from 'path';
99
import * as fs from 'fs';
1010
import { TestSession, execCmd } from '@salesforce/cli-plugins-testkit';
11-
import { expect, config } from 'chai';
11+
import { expect, config, assert } from 'chai';
1212
import { AuthFields } from '@salesforce/core';
1313
import { ComponentSetBuilder } from '@salesforce/source-deploy-retrieve';
1414
import { OrgOpenOutput } from '../../lib/commands/org/open';
@@ -30,9 +30,7 @@ describe('test org:open command', () => {
3030
devhubAuthStrategy: 'AUTO',
3131
scratchOrgs: [
3232
{
33-
executable: 'sfdx',
3433
alias: 'default',
35-
duration: 1,
3634
setDefault: true,
3735
config: path.join('config', 'project-scratch-def.json'),
3836
},
@@ -45,14 +43,12 @@ describe('test org:open command', () => {
4543
});
4644

4745
it('should produce the default URL for a flexipage resource when it not in org in json', () => {
48-
const result = (
49-
execCmd<OrgOpenOutput>(`force:source:open -f ${flexiPagePath} --urlonly --json`, {
50-
ensureExitCode: 0,
51-
}).jsonOutput as { result: OrgOpenOutput }
52-
).result;
53-
expect(result).to.be.ok;
46+
const result = execCmd<OrgOpenOutput>(`force:source:open -f ${flexiPagePath} --urlonly --json`, {
47+
ensureExitCode: 0,
48+
}).jsonOutput?.result;
49+
assert(result);
5450
expect(result).to.include({ orgId: defaultUserOrgId, username: defaultUsername });
55-
expect(result).to.property('url').to.include('lightning/setup/FlexiPageList/home');
51+
expect(result.url).to.include('lightning/setup/FlexiPageList/home');
5652
});
5753

5854
it('should produce the URL for a flexipage resource in json', async () => {
@@ -61,14 +57,12 @@ describe('test org:open command', () => {
6157
const deploy = await cs.deploy({ usernameOrConnection: defaultUsername });
6258
const deployResult = await deploy.pollStatus(1000, 60000);
6359
expect(deployResult.getFileResponses().length).to.not.equal(0);
64-
const result = (
65-
execCmd<OrgOpenOutput>(`force:source:open --sourcefile ${flexiPagePath} --urlonly --json`, {
66-
ensureExitCode: 0,
67-
}).jsonOutput as { result: OrgOpenOutput }
68-
).result;
69-
expect(result).to.be.ok;
60+
const result = execCmd<OrgOpenOutput>(`force:source:open --sourcefile ${flexiPagePath} --urlonly --json`, {
61+
ensureExitCode: 0,
62+
}).jsonOutput?.result;
63+
assert(result);
7064
expect(result).to.include({ orgId: defaultUserOrgId, username: defaultUsername });
71-
expect(result).to.property('url').to.include('/visualEditor/appBuilder.app?pageId');
65+
expect(result.url).to.include('/visualEditor/appBuilder.app?pageId');
7266
});
7367

7468
it("should produce the org's frontdoor url when edition of file is not supported", async () => {
@@ -78,21 +72,19 @@ describe('test org:open command', () => {
7872
path.join(session.project.dir, layoutFilePath),
7973
'<layout xmlns="http://soap.sforce.com/2006/04/metadata">\n</layout>'
8074
);
81-
const result = (
82-
execCmd<OrgOpenOutput>(`force:source:open --source-file ${layoutFilePath} --urlonly --json`, {
83-
ensureExitCode: 0,
84-
}).jsonOutput as { result: OrgOpenOutput }
85-
).result;
86-
expect(result).to.be.ok;
75+
const result = execCmd<OrgOpenOutput>(`force:source:open --source-file ${layoutFilePath} --urlonly --json`, {
76+
ensureExitCode: 0,
77+
}).jsonOutput?.result;
78+
assert(result);
8779
expect(result).to.include({ orgId: defaultUserOrgId, username: defaultUsername });
88-
expect(result).to.property('url').to.include('secur/frontdoor.jsp');
80+
expect(result.url).to.include('secur/frontdoor.jsp');
8981
});
9082

9183
it('org:open command', () => {
9284
const result = execCmd<OrgOpenOutput>('force:org:open --urlonly --json', {
9385
ensureExitCode: 0,
9486
}).jsonOutput?.result;
95-
expect(result).to.be.ok;
87+
assert(result);
9688
expect(result).to.have.keys(['url', 'orgId', 'username']);
9789
expect(result?.url).to.include('/secur/frontdoor.jsp');
9890
});

‎test/unit/org/list.test.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
* Licensed under the BSD 3-Clause license.
55
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
66
*/
7-
import { expect, use as ChaiUse } from 'chai';
8-
import * as chaiAsPromised from 'chai-as-promised';
7+
import { expect } from 'chai';
98
import { TestContext } from '@salesforce/core/lib/testSetup';
109
import { AuthInfo, Connection, Org } from '@salesforce/core';
1110
import { stubMethod } from '@salesforce/ts-sinon';
@@ -14,8 +13,6 @@ import OrgListMock = require('../../shared/orgListMock');
1413
import { OrgListCommand } from '../../../src/commands/org/list';
1514
import { OrgListUtil } from '../../../src/shared/orgListUtil';
1615

17-
ChaiUse(chaiAsPromised);
18-
1916
describe('org:list', () => {
2017
// Create new TestContext, which automatically creates and restores stubs
2118
// pertaining to authorization, orgs, config files, etc...

‎yarn.lock‎

Lines changed: 69 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@
11151115
chalk "^4"
11161116
inquirer "^8.2.5"
11171117

1118-
"@salesforce/source-deploy-retrieve@^7.11.3", "@salesforce/source-deploy-retrieve@^7.15.0":
1118+
"@salesforce/source-deploy-retrieve@^7.11.3":
11191119
version "7.15.0"
11201120
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-7.15.0.tgz#a513bd14a18c6989add4bae62169e38142800cf2"
11211121
integrity sha512-dy9gKkV2wY9skdCJQnO/0pTpAwVD6qrJZpgVfTN/z/h58Iquy4xxCdZB4LxYpOuDW6vvrKVYaJK8iN0vDp4C6g==
@@ -1134,6 +1134,25 @@
11341134
proxy-from-env "^1.1.0"
11351135
unzipper "0.10.11"
11361136

1137+
"@salesforce/source-deploy-retrieve@^8.0.1":
1138+
version "8.0.1"
1139+
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-8.0.1.tgz#769d761cf2a3015282ad6a77e103d2a9c1e99052"
1140+
integrity sha512-uXgMwBXaCH0SM93e8Q/ptGc4xi+wna/CO+SFfZHvy3nnlGHi7MQOUNRnAn2L5NzqEg0ZX9HrXpx4ILf4hLFl3w==
1141+
dependencies:
1142+
"@salesforce/core" "^3.34.6"
1143+
"@salesforce/kit" "^1.9.2"
1144+
"@salesforce/ts-types" "^1.7.2"
1145+
archiver "^5.3.1"
1146+
fast-xml-parser "^4.1.4"
1147+
got "^11.8.6"
1148+
graceful-fs "^4.2.11"
1149+
ignore "^5.2.4"
1150+
mime "2.6.0"
1151+
minimatch "^5.1.6"
1152+
proxy-agent "^5.0.0"
1153+
proxy-from-env "^1.1.0"
1154+
unzipper "0.10.11"
1155+
11371156
"@salesforce/source-tracking@^2.2.24":
11381157
version "2.2.24"
11391158
resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-2.2.24.tgz#ab6746748956eff3150bf9e1d1a97fae8d1dbead"
@@ -1332,13 +1351,6 @@
13321351
"@types/node" "*"
13331352
"@types/responselike" "^1.0.0"
13341353

1335-
"@types/chai-as-promised@^7.1.5":
1336-
version "7.1.5"
1337-
resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.5.tgz#6e016811f6c7a64f2eed823191c3a6955094e255"
1338-
integrity sha512-jStwss93SITGBwt/niYrkf2C+/1KTeZCZl1LaeezTlqppAKeoQC7jxyqYuP72sxBGKCIbw7oHgbYssIRzT5FCQ==
1339-
dependencies:
1340-
"@types/chai" "*"
1341-
13421354
"@types/chai@*", "@types/chai@^4.2.11":
13431355
version "4.3.4"
13441356
resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.4.tgz#e913e8175db8307d78b4e8fa690408ba6b65dee4"
@@ -2269,13 +2281,6 @@ cardinal@^2.1.1:
22692281
ansicolors "~0.3.2"
22702282
redeyed "~2.1.0"
22712283

2272-
chai-as-promised@^7.1.1:
2273-
version "7.1.1"
2274-
resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0"
2275-
integrity sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==
2276-
dependencies:
2277-
check-error "^1.0.2"
2278-
22792284
chai@^4.2.0, chai@^4.3.7:
22802285
version "4.3.7"
22812286
resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.7.tgz#ec63f6df01829088e8bf55fca839bcd464a8ec51"
@@ -2809,7 +2814,7 @@ dayjs@^1.8.16:
28092814
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"
28102815
integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
28112816

2812-
debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
2817+
debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
28132818
version "4.3.4"
28142819
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
28152820
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -3523,10 +3528,10 @@ fast-levenshtein@^3.0.0:
35233528
dependencies:
35243529
fastest-levenshtein "^1.0.7"
35253530

3526-
fast-xml-parser@^4.1.3:
3527-
version "4.1.4"
3528-
resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.1.4.tgz#bb0d02d33854325b3eded07e4a4f2ceb8202ce8b"
3529-
integrity sha512-jKw5Miu3xRSWhXxpWWx3Jujvy231pInmUJgCtsov8JGeuLQsKmYKXlXXPXN1Hopo0YHGuesIlu1cDMKmHa2fJQ==
3531+
fast-xml-parser@^4.1.3, fast-xml-parser@^4.1.4:
3532+
version "4.2.0"
3533+
resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.2.0.tgz#6db2ba33b95b8b4af93f94fe024d4b4d02a50855"
3534+
integrity sha512-+zVQv4aVTO+o8oRUyRL7PjgeVo1J6oP8Cw2+a8UTZQcj5V0yUK5T63gTN0ldgiHDPghUjKc4OpT6SwMTwnOQug==
35303535
dependencies:
35313536
strnum "^1.0.5"
35323537

@@ -5367,6 +5372,13 @@ [email protected]:
53675372
dependencies:
53685373
brace-expansion "^1.1.7"
53695374

5375+
[email protected]:
5376+
version "5.0.1"
5377+
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
5378+
integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==
5379+
dependencies:
5380+
brace-expansion "^2.0.1"
5381+
53705382
minimatch@^5.0.1, minimatch@^5.1.0, minimatch@^5.1.6:
53715383
version "5.1.6"
53725384
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
@@ -5501,6 +5513,33 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
55015513
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
55025514
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
55035515

5516+
mocha@^10.2.0:
5517+
version "10.2.0"
5518+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.2.0.tgz#1fd4a7c32ba5ac372e03a17eef435bd00e5c68b8"
5519+
integrity sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==
5520+
dependencies:
5521+
ansi-colors "4.1.1"
5522+
browser-stdout "1.3.1"
5523+
chokidar "3.5.3"
5524+
debug "4.3.4"
5525+
diff "5.0.0"
5526+
escape-string-regexp "4.0.0"
5527+
find-up "5.0.0"
5528+
glob "7.2.0"
5529+
he "1.2.0"
5530+
js-yaml "4.1.0"
5531+
log-symbols "4.1.0"
5532+
minimatch "5.0.1"
5533+
ms "2.1.3"
5534+
nanoid "3.3.3"
5535+
serialize-javascript "6.0.0"
5536+
strip-json-comments "3.1.1"
5537+
supports-color "8.1.1"
5538+
workerpool "6.2.1"
5539+
yargs "16.2.0"
5540+
yargs-parser "20.2.4"
5541+
yargs-unparser "2.0.0"
5542+
55045543
mocha@^9.1.3:
55055544
version "9.2.2"
55065545
resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.2.tgz#d70db46bdb93ca57402c809333e5a84977a88fb9"
@@ -5615,6 +5654,11 @@ [email protected]:
56155654
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35"
56165655
integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==
56175656

5657+
[email protected]:
5658+
version "3.3.3"
5659+
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
5660+
integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
5661+
56185662
natural-compare-lite@^1.4.0:
56195663
version "1.4.0"
56205664
resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
@@ -7956,6 +8000,11 @@ [email protected]:
79568000
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b"
79578001
integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==
79588002

8003+
[email protected]:
8004+
version "6.2.1"
8005+
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
8006+
integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
8007+
79598008
wrap-ansi@^2.0.0:
79608009
version "2.1.0"
79618010
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"

0 commit comments

Comments
 (0)