Skip to content

Commit c4069f8

Browse files
authored
Merge pull request #575 from salesforcecli/sm/warn-to-stderr
Sm/warn to stderr
2 parents c6fff0e + 465fe2f commit c4069f8

File tree

4 files changed

+33
-39
lines changed

4 files changed

+33
-39
lines changed

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"main": "lib/index.js",
77
"bugs": "https://github.com/forcedotcom/cli/issues",
88
"dependencies": {
9-
"@oclif/core": "^2.0.7",
9+
"@oclif/core": "^2.1.0",
1010
"@salesforce/core": "^3.33.1",
11-
"@salesforce/kit": "^1.8.3",
12-
"@salesforce/sf-plugins-core": "^2.0.1",
11+
"@salesforce/kit": "^1.8.5",
12+
"@salesforce/sf-plugins-core": "^2.1.1",
1313
"open": "8.4.0",
1414
"tslib": "^2"
1515
},
@@ -120,9 +120,9 @@
120120
"test:compile": "wireit",
121121
"test:deprecation-policy": "wireit",
122122
"test:json-schema": "wireit",
123-
"test:nuts": "nyc mocha \"./test/nut/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel",
124-
"test:nuts:legacy": "nyc mocha \"./test/nut/legacy/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel",
125-
"test:nuts:sandbox": "nyc mocha \"./test/**/*.sandboxNut.ts\" --slow 450000 --timeout 7200000 --parallel",
123+
"test:nuts": "nyc mocha \"./test/nut/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --jobs 10",
124+
"test:nuts:legacy": "nyc mocha \"./test/nut/legacy/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --jobs 10",
125+
"test:nuts:sandbox": "nyc mocha \"./test/**/*.sandboxNut.ts\" --slow 450000 --timeout 7200000 --parallel --jobs 10",
126126
"test:only": "wireit",
127127
"test:watch": "mocha --watch \"./test/**/*.test.ts\"",
128128
"version": "oclif readme"
@@ -222,4 +222,4 @@
222222
"output": []
223223
}
224224
}
225-
}
225+
}

test/unit/force/org/clone.test.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,7 @@ describe('org:clone', () => {
157157
expect(uxStyledHeaderStub.calledOnce).to.be.true;
158158

159159
expect(uxTableStub.firstCall.args[0].length).to.be.equal(12);
160-
// one deprecated flag warning for -u, plus 3 sandbox events
161-
expect(uxLogStub.callCount).to.be.equal(4);
162-
expect(uxLogStub.callCount).to.be.equal(4);
160+
expect(uxLogStub.callCount).to.be.equal(3);
163161
const stateAggregator = await StateAggregator.getInstance();
164162
expect(stateAggregator.aliases.getAll()).to.deep.equal({});
165163
// expect(configSetStub.callCount).to.be.equal(0);
@@ -184,17 +182,15 @@ describe('org:clone', () => {
184182
expect(uxStyledHeaderStub.calledOnce).to.be.true;
185183

186184
expect(uxTableStub.firstCall.args[0].length).to.be.equal(12);
187-
// one deprecated flag warning for -u, plus 3 sandbox events
188-
expect(uxLogStub.callCount).to.be.equal(4);
189-
expect(uxLogStub.callCount).to.be.equal(4);
185+
expect(uxLogStub.callCount).to.be.equal(3);
190186

191187
const stateAggregator = await StateAggregator.getInstance();
192188
expect(stateAggregator.aliases.getAll()).to.deep.equal({ [sandboxAlias]: authUserName });
193189

194190
expect($$.stubs.configWrite.callCount).to.equal(1);
195191
expect(uxStyledHeaderStub.callCount).to.equal(1);
196192
expect(uxTableStub.firstCall.args[0].length).to.be.equal(12);
197-
expect(uxLogStub.callCount).to.be.equal(4);
193+
expect(uxLogStub.callCount).to.be.equal(3);
198194

199195
// expect($$.configAggregator?.getGlobalConfig()?.get(OrgConfigProperties.TARGET_ORG)).to.equal(authUserName);
200196
// expect(configSetStub.callCount).to.be.equal(1);
@@ -227,8 +223,6 @@ describe('org:clone', () => {
227223
expect(e.name === 'MyError');
228224
expect(uxStyledHeaderStub.calledOnce).to.be.false;
229225
expect(uxTableStub.calledOnce).to.be.false;
230-
// the deprecation warning
231-
expect(uxLogStub.callCount).to.be.equal(1);
232226
// expect(configSetStub.callCount).to.be.equal(0);
233227
const stateAggregator = await StateAggregator.getInstance();
234228
expect(stateAggregator.aliases.getAll()).to.deep.equal({});

test/unit/force/org/delete.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ describe('org:delete', () => {
6565
$$.SANDBOX.stub(Org.prototype, 'delete').resolves();
6666
const res = await runDeleteCommand(['--noprompt']);
6767
expect(uxConfirmStub.called).to.equal(false);
68-
expect(uxLogStub.callCount).to.equal(2);
68+
expect(uxLogStub.callCount).to.equal(1);
6969
expect(uxLogStub.getCalls().flatMap((call) => call.args)).to.deep.include(
7070
messages.getMessage('deleteOrgCommandSuccess', [testOrg.username])
7171
);
@@ -77,7 +77,7 @@ describe('org:delete', () => {
7777
$$.SANDBOX.stub(Org.prototype, 'delete').resolves();
7878
const res = await runDeleteCommand(['--noprompt']);
7979
expect(uxConfirmStub.called).to.equal(false);
80-
expect(uxLogStub.callCount).to.equal(2);
80+
expect(uxLogStub.callCount).to.equal(1);
8181
expect(uxLogStub.getCalls().flatMap((call) => call.args)).to.deep.include(
8282
messages.getMessage('commandSandboxSuccess', [testOrg.username])
8383
);

yarn.lock

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -764,10 +764,10 @@
764764
widest-line "^3.1.0"
765765
wrap-ansi "^7.0.0"
766766

767-
"@oclif/core@^2.0.3", "@oclif/core@^2.0.7", "@oclif/core@^2.0.8":
768-
version "2.0.8"
769-
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.0.8.tgz#81c79f051ffb326b7c9999463ae9547a7e799316"
770-
integrity sha512-jt06vEZfpazkR0C8vYuVMKmsxjky52y1B1oFGPnCa6/17qH+PByd5knQP6/QbRoE5OT9RAf4zzpxx2wcihVslw==
767+
"@oclif/core@^2.0.10", "@oclif/core@^2.0.3", "@oclif/core@^2.0.8", "@oclif/core@^2.1.0":
768+
version "2.1.0"
769+
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.1.0.tgz#0dc60cdc70c9c260637ca36b748bffe27e9fcdc4"
770+
integrity sha512-ixEPJHU/3BzX+4BnHg2jdb8twDWC0fkG9N6XhxbczjApX/M4XHqtoy+TU5qtHoJ7IjUn8nth964FFx9Kx0F3Cg==
771771
dependencies:
772772
"@types/cli-progress" "^3.11.0"
773773
ansi-escapes "^4.3.2"
@@ -793,7 +793,7 @@
793793
strip-ansi "^6.0.1"
794794
supports-color "^8.1.1"
795795
supports-hyperlinks "^2.2.0"
796-
tslib "^2.4.1"
796+
tslib "^2.5.0"
797797
widest-line "^3.1.0"
798798
wordwrap "^1.0.0"
799799
wrap-ansi "^7.0.0"
@@ -1123,14 +1123,14 @@
11231123
typedoc-plugin-missing-exports "0.23.0"
11241124
typescript "^4.1.3"
11251125

1126-
"@salesforce/kit@^1.8.0", "@salesforce/kit@^1.8.2", "@salesforce/kit@^1.8.3":
1127-
version "1.8.3"
1128-
resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-1.8.3.tgz#b590b78a8618494c51534598a7eb0683ba0da3f2"
1129-
integrity sha512-p+0tWR2pyCAIjZwDXGhrYFPuLckX9fP3Xa6Jync9POeQBfDGyK9CRd1eaiWj+6BeDS9kwvgm5M6o+OptIEhEjw==
1126+
"@salesforce/kit@^1.8.0", "@salesforce/kit@^1.8.2", "@salesforce/kit@^1.8.3", "@salesforce/kit@^1.8.5":
1127+
version "1.8.5"
1128+
resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-1.8.5.tgz#3dcda46e7216363f8703c1c1d3b4dc5d80c1b4d3"
1129+
integrity sha512-py5M1PI5tWy/au/1tJ6qQBv7pHX3B4APqsNxg7yx/s2jbERUD6QNwcmWAayuRpZVVnFXBShBYROFZCojuNJwMA==
11301130
dependencies:
1131-
"@salesforce/ts-types" "^1.7.2"
1131+
"@salesforce/ts-types" "^1.7.3"
11321132
shx "^0.3.3"
1133-
tslib "^2.2.0"
1133+
tslib "^2.5.0"
11341134

11351135
"@salesforce/plugin-command-reference@^2.2.9":
11361136
version "2.2.10"
@@ -1171,12 +1171,12 @@
11711171
chalk "^4"
11721172
inquirer "^8.2.5"
11731173

1174-
"@salesforce/sf-plugins-core@^2.0.1":
1175-
version "2.0.1"
1176-
resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-2.0.1.tgz#079d6cc200ea53ce7fb60aafb5eaf5f2b48e46c9"
1177-
integrity sha512-vT4Y9n/4lStSWrfMAlgQB/XzwJAYK6ibcsFykHNCl86NCoebVGzg5KDIxYjHpidrt2PG/nPk7NL9iBtTH/p8Yg==
1174+
"@salesforce/sf-plugins-core@^2.1.1":
1175+
version "2.1.1"
1176+
resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-2.1.1.tgz#2c03762328d5ad8462de5d364bb1c54836daef3f"
1177+
integrity sha512-O+GP+nY/oRRtPVL7r0ITjUTDT7mbWHQt8jzUJ8nux7mkp1wKk1uq/qTtkDMc1fcFhCkslJSyIzoE84X7j9w7jQ==
11781178
dependencies:
1179-
"@oclif/core" "^2.0.7"
1179+
"@oclif/core" "^2.0.10"
11801180
"@salesforce/core" "^3.33.1"
11811181
"@salesforce/kit" "^1.8.3"
11821182
"@salesforce/ts-types" "^1.7.1"
@@ -1192,12 +1192,12 @@
11921192
sinon "^5.1.1"
11931193
tslib "^2.2.0"
11941194

1195-
"@salesforce/ts-types@^1.7.1", "@salesforce/ts-types@^1.7.2":
1196-
version "1.7.2"
1197-
resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-1.7.2.tgz#ab40399d291c7eca57efc9890daf2fa2632197ec"
1198-
integrity sha512-eCpWKEb03UCKBJ6Svp0Vwcwt+fG6BQbopO4x5wt6CYeT8Rjt0dbDQicZPmVL59j2qyt3Q4Y4EYsxXUGZmdfvDw==
1195+
"@salesforce/ts-types@^1.7.1", "@salesforce/ts-types@^1.7.2", "@salesforce/ts-types@^1.7.3":
1196+
version "1.7.3"
1197+
resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-1.7.3.tgz#89b79ff0aaa55fea9f2de0afa8e515be3e17d0d8"
1198+
integrity sha512-jpmekGqZ7tpHRJwf1rF0yBJ/IMC5mOrryNi4HZkKuNQn8RF97WpynmL8Om04mLTCESvCiif3y7NWfIcxtID2Gw==
11991199
dependencies:
1200-
tslib "^2.4.1"
1200+
tslib "^2.5.0"
12011201

12021202
"@sindresorhus/is@^4.0.0":
12031203
version "4.6.0"

0 commit comments

Comments
 (0)