diff --git a/package.json b/package.json index 4257e6f1..5d5c4e84 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "@salesforce/dev-config": "^4.1.0", "@salesforce/dev-scripts": "^5.12.2", "@salesforce/plugin-command-reference": "^3.0.42", - "@salesforce/plugin-settings": "^1.4.35", "@salesforce/prettier-config": "^0.0.3", "@salesforce/ts-sinon": "^1.4.15", "@swc/core": "1.3.39", @@ -77,8 +76,7 @@ "devPlugins": [ "@oclif/plugin-help", "@oclif/plugin-command-snapshot", - "@salesforce/plugin-command-reference", - "@salesforce/plugin-settings" + "@salesforce/plugin-command-reference" ], "topics": { "org": { diff --git a/test/commands/org/logout.nut.ts b/test/commands/org/logout.nut.ts index 9193ec53..2bd95a59 100644 --- a/test/commands/org/logout.nut.ts +++ b/test/commands/org/logout.nut.ts @@ -52,8 +52,8 @@ describe('org:logout NUTs', () => { }); it('should clear any configs that use the removed username (json)', () => { - execCmd(`config:set target-org=${username} --global`, { ensureExitCode: 0 }); - execCmd(`config:set target-dev-hub=${username} --global`, { ensureExitCode: 0 }); + execCmd(`config:set target-org=${username} --global`, { ensureExitCode: 0, cli: 'sf' }); + execCmd(`config:set target-dev-hub=${username} --global`, { ensureExitCode: 0, cli: 'sf' }); const json = execCmd(`org:logout -p -o ${username} --json`, { ensureExitCode: 0 }).jsonOutput; expect(json).to.deep.equal({ status: 0, @@ -68,11 +68,13 @@ describe('org:logout NUTs', () => { const configGetUsername = execCmd>('config:get target-org --json', { ensureExitCode: 0, + cli: 'sf', }).jsonOutput?.result as Array<{ key: string }>; expect(['target-org', 'defaultusername']).to.include(configGetUsername[0].key); const configGetDevhub = execCmd>('config:get target-dev-hub --json', { ensureExitCode: 0, + cli: 'sf', }).jsonOutput?.result as Array<{ key: string }>; expect(['target-dev-hub', 'defaultdevhubusername']).to.include(configGetDevhub[0].key); }); @@ -89,7 +91,7 @@ describe('org:logout NUTs', () => { }); it('should remove the default username if the -o flag is not specified (json)', () => { - execCmd(`config:set target-org=${username} --global`, { ensureExitCode: 0 }); + execCmd(`config:set target-org=${username} --global`, { ensureExitCode: 0, cli: 'sf' }); const json = execCmd('org:logout -p --json', { ensureExitCode: 0 }).jsonOutput; expect(json).to.deep.equal({ status: 0, @@ -100,6 +102,7 @@ describe('org:logout NUTs', () => { // we expect the config for target-org to be cleared out after the logout const configGet = execCmd>('config:get target-org --json', { ensureExitCode: 0, + cli: 'sf', }).jsonOutput?.result as Array<{ key: string }>; expect(['target-org', 'defaultusername']).to.include(configGet[0].key); }); diff --git a/yarn.lock b/yarn.lock index 9a250e34..6bdafcf0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -893,7 +893,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.7.1" -"@salesforce/core@^5.2.10", "@salesforce/core@^5.3.1", "@salesforce/core@^5.3.14", "@salesforce/core@^5.3.5", "@salesforce/core@^5.3.9": +"@salesforce/core@^5.3.1", "@salesforce/core@^5.3.14", "@salesforce/core@^5.3.5", "@salesforce/core@^5.3.9": version "5.3.14" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-5.3.14.tgz#a5a3d02be6727492469ed39b23eaf3c56675496b" integrity sha512-IFmLZCpFBcreTFEaH+Rn4BozUpFx3vvf43yWuXWdOvALz4ad18yU3Kzk9GxwzablrQxPFmJ43ClQG10dmoh/ig== @@ -983,17 +983,6 @@ handlebars "^4.7.8" tslib "^2" -"@salesforce/plugin-settings@^1.4.35": - version "1.4.35" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-settings/-/plugin-settings-1.4.35.tgz#9fc4ebb1fcb0fdb115f06fc0f7e2e7e6084dff38" - integrity sha512-BKimSUDwLiDzW4/SZjXvQVg1hFIKmYAQRonwk8rUzQgGyCx33fmwZivBGnpXiBaZwXPScM9IAIl7kI3OWY1veA== - dependencies: - "@oclif/core" "^2.15.0" - "@salesforce/core" "^5.2.10" - "@salesforce/sf-plugins-core" "^3.1.25" - fast-levenshtein "^3.0.0" - tslib "^2" - "@salesforce/prettier-config@^0.0.3": version "0.0.3" resolved "https://registry.yarnpkg.com/@salesforce/prettier-config/-/prettier-config-0.0.3.tgz#ba648d4886bb38adabe073dbea0b3a91b3753bb0" @@ -1004,7 +993,7 @@ resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.1.tgz#7d1c071e1e509ca9d2d8a6e48ac7447dd67a534d" integrity sha512-eVy947ZMxCJReKJdgfddUIsBIbPTa/i8RwQGwxq4/ss38H5sLOAeSTaun9V7HpJ1hkpDznWKfgzYvjsst9K6ig== -"@salesforce/sf-plugins-core@^3.1.25", "@salesforce/sf-plugins-core@^3.1.28": +"@salesforce/sf-plugins-core@^3.1.28": version "3.1.28" resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-3.1.28.tgz#7714c5b1ce26052bb5cbc524c5990bc52eb601cd" integrity sha512-Z1fVS/pqLCX/3ESrjvtzyuvDFwXu8qxjqs5Gana0J7RKkhDL0f7w+pz3DR1/YfQPeHK8rk9pFDOKB3tOnXf9Lw==