Skip to content

Commit ee1da6b

Browse files
fix(deps): bump @oclif/core from 3.23.0 to 3.26.0 (#392)
* fix(deps): bump @oclif/core from 3.23.0 to 3.26.0 Bumps [@oclif/core](https://github.com/oclif/core) from 3.23.0 to 3.26.0. - [Release notes](https://github.com/oclif/core/releases) - [Changelog](https://github.com/oclif/core/blob/main/CHANGELOG.md) - [Commits](oclif/core@3.23.0...3.26.0) --- updated-dependencies: - dependency-name: "@oclif/core" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * test: init and load config --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mike Donnalley <[email protected]>
1 parent 33fb137 commit ee1da6b

File tree

8 files changed

+58
-32
lines changed

8 files changed

+58
-32
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"author": "Salesforce",
66
"bugs": "https://github.com/forcedotcom/cli/issues",
77
"dependencies": {
8-
"@oclif/core": "^3.23.0",
8+
"@oclif/core": "^3.26.0",
99
"@salesforce/apex-node": "^3.1.0",
1010
"@salesforce/core": "^6.5.1",
1111
"@salesforce/kit": "^3.1.0",

test/commands/apex/get/log.test.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
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 { dirname, resolve } from 'node:path';
8-
import { fileURLToPath } from 'node:url';
97
import fs from 'node:fs';
108
import { Config } from '@oclif/core';
119
import sinon from 'sinon';
@@ -16,11 +14,12 @@ import { Org } from '@salesforce/core';
1614
import Log from '../../../../src/commands/apex/get/log.js';
1715

1816
describe('apex:log:get', () => {
19-
const config = new Config({ root: resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json') });
17+
let config: Config;
2018
let sandbox: sinon.SinonSandbox;
2119
let logStub: sinon.SinonStub;
2220

23-
beforeEach(() => {
21+
beforeEach(async () => {
22+
config = await Config.load(import.meta.url);
2423
sandbox = sinon.createSandbox();
2524
logStub = sandbox.stub(SfCommand.prototype, 'log');
2625
sandbox.stub(Org, 'create').resolves({ getConnection: () => ({}) } as Org);
@@ -39,7 +38,7 @@ describe('apex:log:get', () => {
3938

4039
it('0 logs to get', async () => {
4140
sandbox.stub(LogService.prototype, 'getLogs').resolves([]);
42-
const result = await new Log([], config).run();
41+
const result = await Log.run([], config);
4342
expect(result).to.deep.equal([]);
4443
expect(logStub.firstCall.args[0]).to.equal('No results found');
4544
});

test/commands/apex/get/test.test.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
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 { dirname, resolve } from 'node:path';
8-
import { fileURLToPath } from 'node:url';
97
import fs from 'node:fs';
108
import { Connection, Org } from '@salesforce/core';
119
import sinon from 'sinon';
@@ -21,10 +19,10 @@ let styledJsonStub: sinon.SinonStub;
2119

2220
describe('apex:test:report', () => {
2321
let sandbox: sinon.SinonSandbox;
24-
const config = new Config({ root: resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json') });
25-
config.bin = 'sfdx';
22+
let config: Config;
2623

2724
beforeEach(async () => {
25+
config = await Config.load(import.meta.url);
2826
sandbox = sinon.createSandbox();
2927
logStub = sandbox.stub(Ux.prototype, 'log');
3028
styledJsonStub = sandbox.stub(Ux.prototype, 'styledJSON');
@@ -65,7 +63,7 @@ describe('apex:test:report', () => {
6563
expect(result).to.deep.equal(testRunWithFailuresResult);
6664
expect(logStub.firstCall.args[0]).to.include('1..1');
6765
expect(logStub.firstCall.args[0]).to.include('ok 1 MyApexTests.testConfig');
68-
expect(logStub.firstCall.args[0]).to.include('# Run "sfdx apex get test');
66+
expect(logStub.firstCall.args[0]).to.include('# Run "sf apex get test');
6967
});
7068

7169
it('should return a success junit format message with async', async () => {
@@ -131,7 +129,7 @@ describe('apex:test:report', () => {
131129
expect(result).to.deep.equal(testRunSimpleResult);
132130
expect(logStub.firstCall.args[0]).to.include('1..1');
133131
expect(logStub.firstCall.args[0]).to.include('ok 1 MyApexTests.testConfig');
134-
expect(logStub.firstCall.args[0]).to.include('# Run "sfdx apex get test');
132+
expect(logStub.firstCall.args[0]).to.include('# Run "sf apex get test');
135133
});
136134

137135
it('should return a success junit format message with async', async () => {

test/commands/apex/list/log.test.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
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 { dirname, resolve } from 'node:path';
8-
import { fileURLToPath } from 'node:url';
97
import { LogService } from '@salesforce/apex-node';
108
import { Config } from '@oclif/core';
119
import sinon from 'sinon';
@@ -53,12 +51,13 @@ const rawLogResult = {
5351
const logRecords = [rawLogResult.result[0], rawLogResult.result[1]];
5452

5553
describe('apex:log:list', () => {
56-
const config = new Config({ root: resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json') });
54+
let config: Config;
5755
let sandbox: sinon.SinonSandbox;
5856
let logStub: sinon.SinonStub;
5957
let tableStub: sinon.SinonStub;
6058

61-
beforeEach(() => {
59+
beforeEach(async () => {
60+
config = await Config.load(import.meta.url);
6261
sandbox = sinon.createSandbox();
6362
logStub = sandbox.stub(SfCommand.prototype, 'log');
6463
tableStub = sandbox.stub(SfCommand.prototype, 'table');

test/commands/apex/run.test.ts

Lines changed: 4 additions & 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 { dirname, join, resolve } from 'node:path';
8-
import { fileURLToPath } from 'node:url';
7+
import { join } from 'node:path';
98
import fs from 'node:fs';
109
import { expect } from 'chai';
1110
import { ExecuteService } from '@salesforce/apex-node';
@@ -31,9 +30,10 @@ const expectedSuccessResult = {
3130
describe('apex:execute', () => {
3231
let sandboxStub: sinon.SinonSandbox;
3332
let logStub: sinon.SinonStub;
34-
const config = new Config({ root: resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json') });
33+
let config: Config;
3534

36-
beforeEach(() => {
35+
beforeEach(async () => {
36+
config = await Config.load(import.meta.url);
3737
sandboxStub = sinon.createSandbox();
3838
logStub = sandboxStub.stub(SfCommand.prototype, 'log');
3939
sandboxStub.stub(Org, 'create').resolves({ getConnection: () => ({}) } as Org);

test/commands/apex/run/test.test.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
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 { dirname, resolve } from 'node:path';
8-
import { fileURLToPath } from 'node:url';
97
import fs from 'node:fs';
108
import { Messages, Org } from '@salesforce/core';
119
import sinon from 'sinon';
@@ -30,11 +28,10 @@ let styledJsonStub: sinon.SinonStub;
3028

3129
describe('apex:test:run', () => {
3230
let sandbox: sinon.SinonSandbox;
33-
const config = new Config({ root: resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json') });
34-
// give it an sfdx bin for now
35-
config.bin = 'sfdx';
31+
let config: Config;
3632

3733
beforeEach(async () => {
34+
config = await Config.load(import.meta.url);
3835
sandbox = sinon.createSandbox();
3936
logStub = sandbox.stub(Ux.prototype, 'log');
4037
styledJsonStub = sandbox.stub(Ux.prototype, 'styledJSON');
@@ -76,7 +73,7 @@ describe('apex:test:run', () => {
7673
expect(result).to.deep.equal(testRunWithFailuresResult);
7774
expect(logStub.firstCall.args[0]).to.include('1..1');
7875
expect(logStub.firstCall.args[0]).to.include('ok 1 MyApexTests.testConfig');
79-
expect(logStub.firstCall.args[0]).to.include('# Run "sfdx apex get test -i 707');
76+
expect(logStub.firstCall.args[0]).to.include('# Run "sf apex get test -i 707');
8077
});
8178

8279
it('should return a success junit format message with async', async () => {
@@ -327,7 +324,7 @@ describe('apex:test:run', () => {
327324
expect(result).to.deep.equal(testRunSimpleResult);
328325
expect(logStub.firstCall.args[0]).to.include('1..1');
329326
expect(logStub.firstCall.args[0]).to.include('ok 1 MyApexTests.testConfig');
330-
expect(logStub.firstCall.args[0]).to.include('# Run "sfdx apex get test -i 707');
327+
expect(logStub.firstCall.args[0]).to.include('# Run "sf apex get test -i 707');
331328
});
332329

333330
it('should return a success junit format message with async', async () => {

test/commands/apex/tail/log.test.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
66
*/
77

8-
import { dirname, resolve } from 'node:path';
9-
import { fileURLToPath } from 'node:url';
108
import sinon from 'sinon';
119
import { LogService } from '@salesforce/apex-node';
1210
import { Config } from '@oclif/core';
@@ -16,9 +14,10 @@ import Log from '../../../../src/commands/apex/tail/log.js';
1614

1715
describe('apex:log:tail', () => {
1816
let sandbox: sinon.SinonSandbox;
19-
const config = new Config({ root: resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json') });
17+
let config: Config;
2018

21-
beforeEach(() => {
19+
beforeEach(async () => {
20+
config = await Config.load(import.meta.url);
2221
sandbox = sinon.createSandbox();
2322

2423
sandbox.stub(Org, 'create').resolves({ getConnection: () => ({}) } as Org);

yarn.lock

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1786,7 +1786,7 @@
17861786
read-package-json-fast "^3.0.0"
17871787
which "^3.0.0"
17881788

1789-
"@oclif/[email protected]", "@oclif/core@^3.15.1", "@oclif/core@^3.20.0", "@oclif/core@^3.21.0", "@oclif/core@^3.23.0":
1789+
17901790
version "3.25.2"
17911791
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.25.2.tgz#a26d56abe5686c57c1e973957777bd2ae324e973"
17921792
integrity sha512-OkW/cNa/3DhoCz2YlSpymVe8DXqkoRaLY4SPTVqNVzR4R1dFBE5KoCtuwKwnhxYLCRCqaViPgRnB5K26f0MnjA==
@@ -1820,6 +1820,40 @@
18201820
wordwrap "^1.0.0"
18211821
wrap-ansi "^7.0.0"
18221822

1823+
"@oclif/core@^3.15.1", "@oclif/core@^3.20.0", "@oclif/core@^3.21.0", "@oclif/core@^3.23.0", "@oclif/core@^3.26.0":
1824+
version "3.26.0"
1825+
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.26.0.tgz#959d5e9f13f4ad6a4e98235ad125189df9ee4279"
1826+
integrity sha512-TpMdfD4tfA2tVVbd4l0PrP02o5KoUXYmudBbTC7CeguDo/GLoprw4uL8cMsaVA26+cbcy7WYtOEydQiHVtJixA==
1827+
dependencies:
1828+
"@types/cli-progress" "^3.11.5"
1829+
ansi-escapes "^4.3.2"
1830+
ansi-styles "^4.3.0"
1831+
cardinal "^2.1.1"
1832+
chalk "^4.1.2"
1833+
clean-stack "^3.0.1"
1834+
cli-progress "^3.12.0"
1835+
color "^4.2.3"
1836+
debug "^4.3.4"
1837+
ejs "^3.1.9"
1838+
get-package-type "^0.1.0"
1839+
globby "^11.1.0"
1840+
hyperlinker "^1.0.0"
1841+
indent-string "^4.0.0"
1842+
is-wsl "^2.2.0"
1843+
js-yaml "^3.14.1"
1844+
minimatch "^9.0.3"
1845+
natural-orderby "^2.0.3"
1846+
object-treeify "^1.1.33"
1847+
password-prompt "^1.1.3"
1848+
slice-ansi "^4.0.0"
1849+
string-width "^4.2.3"
1850+
strip-ansi "^6.0.1"
1851+
supports-color "^8.1.1"
1852+
supports-hyperlinks "^2.2.0"
1853+
widest-line "^3.1.0"
1854+
wordwrap "^1.0.0"
1855+
wrap-ansi "^7.0.0"
1856+
18231857
"@oclif/plugin-command-snapshot@^5.1.2":
18241858
version "5.1.2"
18251859
resolved "https://registry.yarnpkg.com/@oclif/plugin-command-snapshot/-/plugin-command-snapshot-5.1.2.tgz#acba4a0138823931468d91be8d2a990da8a82623"

0 commit comments

Comments
 (0)