From cb73785c47d59b8b65c497068ca239067c3f36c9 Mon Sep 17 00:00:00 2001
From: Mike Donnalley <mdonnalley@salesforce.com>
Date: Mon, 30 Oct 2023 13:12:00 -0600
Subject: [PATCH] test: remove plugin-settings as devPlugin

---
 package.json                    |  4 +---
 test/commands/org/logout.nut.ts |  9 ++++++---
 yarn.lock                       | 18 ------------------
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index c7073648..48d83cb3 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
     "@salesforce/dev-config": "^4.0.1",
     "@salesforce/dev-scripts": "^5.7.0",
     "@salesforce/plugin-command-reference": "^3.0.25",
-    "@salesforce/plugin-settings": "^1.4.27",
     "@salesforce/prettier-config": "^0.0.3",
     "@salesforce/ts-sinon": "^1.4.6",
     "@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<Array<{ key: string }>>('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<Array<{ key: string }>>('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<Array<{ key: string }>>('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 9657f91b..f9efeea0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -974,17 +974,6 @@
     handlebars "^4.7.8"
     tslib "^2"
 
-"@salesforce/plugin-settings@^1.4.27":
-  version "1.4.27"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-settings/-/plugin-settings-1.4.27.tgz#7b31dbfd0d3ca8511b8d735001293131b40931a0"
-  integrity sha512-OJLGOtM6MXHIbi6r1Gzmy0+bTvDcYEmUhAPbs1hQrc9ina4FDsx5usJ0wl5JRmg8TGulDLe99eRBrZ6pd6ldHg==
-  dependencies:
-    "@oclif/core" "^2.11.10"
-    "@salesforce/core" "^5.2.0"
-    "@salesforce/sf-plugins-core" "^3.1.18"
-    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"
@@ -1030,13 +1019,6 @@
   dependencies:
     tslib "^2.6.2"
 
-"@salesforce/ts-types@^2.0.7":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-2.0.7.tgz#02a6999d0b0e7bcd6c6d8ce621c79fa61af24701"
-  integrity sha512-8csXgstPuy6QXL3JavkIi/f8DOWHBNCvWeszrFu5sbVlcKO3YqOOCE+rDFGPkrZsYv5OywV6H8kEi877bWOz6Q==
-  dependencies:
-    tslib "^2.6.2"
-
 "@sindresorhus/is@^4.0.0":
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"