@salesforce/core 5.3.16 → 5.3.17

package/lib/testSetup.js

@@ -18,7 +18,6 @@ const events_1 = require("events");
 const os_1 = require("os");
 const path_1 = require("path");
 const util = require("util");
-const ts_sinon_1 = require("@salesforce/ts-sinon");
 const ts_types_1 = require("@salesforce/ts-types");
 const configAggregator_1 = require("./config/configAggregator");
 const configFile_1 = require("./config/configFile");
@@ -186,8 +185,9 @@ class TestContext {
     async stubAuths(...orgs) {
         const entries = await Promise.all(orgs.map(async (org) => [org.username, await org.getConfig()]));
         const orgMap = new Map(entries);
-        (0, ts_sinon_1.stubMethod)(this.SANDBOX, stateAggregator_1.OrgAccessor.prototype, 'getAllFiles').resolves([...orgMap.keys()].map((o) => `${o}.json`));
-        (0, ts_sinon_1.stubMethod)(this.SANDBOX, stateAggregator_1.OrgAccessor.prototype, 'hasFile').callsFake((username) => orgMap.has(username));
+        // @ts-expect-error because private method
+        this.SANDBOX.stub(stateAggregator_1.OrgAccessor.prototype, 'getAllFiles').resolves([...orgMap.keys()].map((o) => `${o}.json`));
+        this.SANDBOX.stub(stateAggregator_1.OrgAccessor.prototype, 'hasFile').callsFake((username) => Promise.resolve(orgMap.has(username)));
         const retrieveContents = async function () {
             const username = (0, path_1.basename)(this.path.replace('.json', ''));
             return Promise.resolve(orgMap.get(username) ?? {});
@@ -224,7 +224,12 @@ class TestContext {
                 ? [adminOrg.orgId, { usernames: orgs.filter((org) => org.username !== adminUsername) }]
                 : [undefined, undefined];
         }));
-        (0, ts_sinon_1.stubMethod)(this.SANDBOX, org_1.User.prototype, 'retrieve').callsFake((username) => Promise.resolve(mockUsers.find((org) => org.username === username)));
+        this.SANDBOX.stub(org_1.User.prototype, 'retrieve').callsFake((username) => {
+            const user = mockUsers.find((org) => org.username === username);
+            if (!user)
+                throw new sfError_1.SfError('User not found', 'UserNotFoundError');
+            return Promise.resolve(user);
+        });
         const retrieveContents = async function () {
             const orgId = (0, path_1.basename)(this.path.replace('.json', ''));
             return Promise.resolve(userOrgsMap.get(orgId) ?? {});
@@ -237,7 +242,8 @@ class TestContext {
     async stubSandboxes(...sandboxes) {
         const entries = (await Promise.all(sandboxes.map(async (sandbox) => [sandbox.username, await sandbox.getConfig()])));
         const sandboxMap = new Map(entries);
-        (0, ts_sinon_1.stubMethod)(this.SANDBOX, sandboxAccessor_1.SandboxAccessor.prototype, 'getAllFiles').resolves([...sandboxMap.keys()].map((o) => `${o}.sandbox.json`));
+        // @ts-expect-error because private method
+        this.SANDBOX.stub(sandboxAccessor_1.SandboxAccessor.prototype, 'getAllFiles').resolves([...sandboxMap.keys()].map((o) => `${o}.sandbox.json`));
         const retrieveContents = async function () {
             const username = (0, path_1.basename)(this.path.replace('.sandbox.json', ''));
             return Promise.resolve(sandboxMap.get(username) ?? {});
@@ -391,12 +397,13 @@ const stubContext = (testContext) => {
     global_1.Global.SFDX_INTEROPERABILITY = false;
     const stubs = {};
     // Most core files create a child logger so stub this to return our test logger.
-    (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, logger_1.Logger, 'child').resolves(testContext.TEST_LOGGER);
-    (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, logger_1.Logger, 'childFromRoot').returns(testContext.TEST_LOGGER);
+    testContext.SANDBOX.stub(logger_1.Logger, 'child').resolves(testContext.TEST_LOGGER);
+    testContext.SANDBOX.stub(logger_1.Logger, 'childFromRoot').returns(testContext.TEST_LOGGER);
     testContext.inProject(true);
     testContext.SANDBOXES.CONFIG.stub(configFile_1.ConfigFile, 'resolveRootFolder').callsFake((isGlobal) => testContext.rootPathRetriever(isGlobal, testContext.id));
     testContext.SANDBOXES.CONFIG.stub(configFile_1.ConfigFile, 'resolveRootFolderSync').callsFake((isGlobal) => testContext.rootPathRetrieverSync(isGlobal, testContext.id));
-    (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.PROJECT, sfProject_1.SfProjectJson.prototype, 'doesPackageExist').callsFake(() => true);
+    // @ts-expect-error using private method
+    testContext.SANDBOXES.PROJECT.stub(sfProject_1.SfProjectJson.prototype, 'doesPackageExist').callsFake(() => true);
     const initStubForRead = (configFile) => {
         const stub = testContext.configStubs[configFile.constructor.name] ?? {};
         // init calls read calls getPath which sets the path on the config file the first time.
@@ -454,33 +461,37 @@ const stubContext = (testContext) => {
             writeSync.call(this);
         }
     };
-    stubs.configWriteSync = (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CONFIG, configFile_1.ConfigFile.prototype, 'writeSync').callsFake(writeSync);
-    stubs.configWrite = (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CONFIG, configFile_1.ConfigFile.prototype, 'write').callsFake(write);
-    (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CRYPTO, crypto_2.Crypto.prototype, 'getKeyChain').callsFake(() => Promise.resolve({
+    stubs.configWriteSync = testContext.SANDBOXES.CONFIG.stub(configFile_1.ConfigFile.prototype, 'writeSync').callsFake(writeSync);
+    stubs.configWrite = testContext.SANDBOXES.CONFIG.stub(configFile_1.ConfigFile.prototype, 'write').callsFake(write);
+    // @ts-expect-error: getKeyChain is private
+    testContext.SANDBOXES.CRYPTO.stub(crypto_2.Crypto.prototype, 'getKeyChain').callsFake(() => 
+    // @ts-expect-error: not the full type
+    Promise.resolve({
         setPassword: () => Promise.resolve(),
         getPassword: (data, cb) => cb(undefined, '12345678901234567890123456789012'),
     }));
-    (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CONNECTION, connection_1.Connection.prototype, 'isResolvable').resolves(true);
-    (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.CONNECTION, connection_1.Connection.prototype, 'request').callsFake(function (request, options) {
+    testContext.SANDBOXES.CONNECTION.stub(connection_1.Connection.prototype, 'isResolvable').resolves(true);
+    // @ts-expect-error: just enough of an httpResponse for testing
+    testContext.SANDBOXES.CONNECTION.stub(connection_1.Connection.prototype, 'request').callsFake(function (request, options) {
         if (request === `${this.instanceUrl}/services/data`) {
             return Promise.resolve([{ version: '42.0' }]);
         }
         return testContext.fakeConnectionRequest.call(this, request, options);
     });
-    (0, ts_sinon_1.stubMethod)(testContext.SANDBOX, aliasAccessorEntireFile, 'getFileLocation').returns(getAliasFileLocation());
-    stubs.configExists = (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.ORGS, stateAggregator_1.OrgAccessor.prototype, 'exists').callsFake(async function (username) {
+    testContext.SANDBOX.stub(aliasAccessorEntireFile, 'getFileLocation').returns(getAliasFileLocation());
+    stubs.configExists = testContext.SANDBOXES.ORGS.stub(stateAggregator_1.OrgAccessor.prototype, 'exists').callsFake(async function (username) {
         // @ts-expect-error because private member
         if ([...this.contents.keys()].includes(username))
             return Promise.resolve(true);
         else
             return Promise.resolve(false);
     });
-    stubs.configRemove = (0, ts_sinon_1.stubMethod)(testContext.SANDBOXES.ORGS, stateAggregator_1.OrgAccessor.prototype, 'remove').callsFake(async function (username) {
+    stubs.configRemove = testContext.SANDBOXES.ORGS.stub(stateAggregator_1.OrgAccessor.prototype, 'remove').callsFake(async function (username) {
         // @ts-expect-error because private member
         if ([...this.contents.keys()].includes(username))
-            return Promise.resolve(true);
+            return Promise.resolve();
         else
-            return Promise.resolve(false);
+            return Promise.resolve();
     });
     // Always start with the default and tests beforeEach or it methods can override it.
     testContext.fakeConnectionRequest = defaultFakeConnectionRequest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "5.3.16",
+  "version": "5.3.17",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",