Skip to content

Commit 4821e08

Browse files
committed
chore: review updates
1 parent 57a0567 commit 4821e08

File tree

4 files changed

+9
-19
lines changed

4 files changed

+9
-19
lines changed

src/shared/sandboxCommandBase.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ export abstract class SandboxCommandBase<T> extends SfCommand<T> {
260260
sbxUsername = this.getSandboxUsername(prodOrgUsername, sandboxName);
261261
}
262262
}
263-
return Object.assign({}, this.latestSandboxProgressObj, { SandboxUsername: sbxUsername });
263+
return { ...(this.latestSandboxProgressObj as SandboxProcessObject), SandboxUsername: sbxUsername };
264264
}
265265

266266
// eslint-disable-next-line @typescript-eslint/no-explicit-any

test/nut/sandboxCreate.nut.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ describe('Sandbox Create', () => {
8585
const sbxName = 'createSbx1';
8686
const sbxLicenseType = 'Developer';
8787
const sbxProcess = getSandboxProcess({ SandboxName: sbxName });
88-
const expectedCmdResponse = Object.assign({}, sbxProcess, { SandboxUsername: `${hubOrgUsername}.${sbxName}` });
88+
const expectedCmdResponse = { ...sbxProcess, SandboxUsername: `${hubOrgUsername}.${sbxName}` };
8989
const connection = await stubProdOrgConnection(sinonSandbox, hubOrgUsername);
9090

9191
const toolingCreateStub = stubToolingCreate({ sinonSandbox, connection });
@@ -119,7 +119,7 @@ describe('Sandbox Create', () => {
119119
const sbxName = 'createSbx2';
120120
const sbxLicenseType = 'Partial';
121121
const sbxProcess = getSandboxProcess({ SandboxName: sbxName, LicenseType: sbxLicenseType });
122-
const expectedCmdResponse = Object.assign({}, sbxProcess, { SandboxUsername: `${hubOrgUsername}.${sbxName}` });
122+
const expectedCmdResponse = { ...sbxProcess, SandboxUsername: `${hubOrgUsername}.${sbxName}` };
123123
const connection = await stubProdOrgConnection(sinonSandbox, hubOrgUsername);
124124

125125
const toolingCreateStub = stubToolingCreate({ sinonSandbox, connection });

test/nut/sandboxRefresh.nut.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ describe('Sandbox Refresh', () => {
9090
const sbxName = 'refrshSbx1';
9191
const sbxInfo = getSandboxInfo({ SandboxName: sbxName });
9292
const sbxProcess = getSandboxProcess({ SandboxName: sbxName });
93-
const expectedCmdResponse = Object.assign({}, sbxProcess, { SandboxUsername: `${hubOrgUsername}.${sbxName}` });
93+
const expectedCmdResponse = { ...sbxProcess, SandboxUsername: `${hubOrgUsername}.${sbxName}` };
9494
const sandboxInfoSoql = getSandboxInfoSoql(sbxName);
9595
const sandboxProcessSoql = getSandboxProcessSoql({ SandboxName: sbxName });
9696
const connection = await stubProdOrgConnection(sinonSandbox, hubOrgUsername);
@@ -129,7 +129,7 @@ describe('Sandbox Refresh', () => {
129129
const sbxName = defaultSbxName;
130130
const sbxInfo = getSandboxInfo({ LicenseType: 'DEVELOPER PRO', SandboxName: sbxName });
131131
const sbxProcess = getSandboxProcess({ SandboxName: sbxName });
132-
const expectedCmdResponse = Object.assign({}, sbxProcess, { SandboxUsername: `${hubOrgUsername}.${sbxName}` });
132+
const expectedCmdResponse = { ...sbxProcess, SandboxUsername: `${hubOrgUsername}.${sbxName}` };
133133
const sandboxInfoSoql = getSandboxInfoSoql(sbxName);
134134
const sandboxProcessSoql = getSandboxProcessSoql({ SandboxName: sbxName });
135135
const connection = await stubProdOrgConnection(sinonSandbox, hubOrgUsername);
@@ -218,7 +218,7 @@ describe('Sandbox Refresh', () => {
218218
const sbxName = 'refrshSbx4';
219219
const sbxInfo = getSandboxInfo({ SandboxName: sbxName });
220220
const sbxProcess = getSandboxProcess({ SandboxName: sbxName });
221-
const expectedCmdResponse = Object.assign({}, sbxProcess, { SandboxUsername: `${hubOrgUsername}.${sbxName}` });
221+
const expectedCmdResponse = { ...sbxProcess, SandboxUsername: `${hubOrgUsername}.${sbxName}` };
222222
const sandboxInfoSoql = getSandboxInfoSoql(sbxName);
223223
const sandboxProcessSoql = getSandboxProcessSoql({ SandboxName: sbxName });
224224

@@ -270,9 +270,7 @@ describe('Sandbox Refresh', () => {
270270
const sandboxProcessSoql = getSandboxProcessSoql({ SandboxName: sbxName });
271271

272272
const updatedSbxProcess = getSandboxProcess({ Status: 'Processing', CopyProgress: 90, SandboxName: sbxName });
273-
const expectedCmdResponse = Object.assign({}, updatedSbxProcess, {
274-
SandboxUsername: `${hubOrgUsername}.${sbxName}`,
275-
});
273+
const expectedCmdResponse = { ...updatedSbxProcess, SandboxUsername: `${hubOrgUsername}.${sbxName}` };
276274
const connection = await stubProdOrgConnection(sinonSandbox, hubOrgUsername);
277275

278276
const singleRecordQueryStub = stubSingleRecordQuery({ sinonSandbox, connection, sandboxInfoSoql, sbxInfo });
@@ -333,9 +331,7 @@ describe('Sandbox Refresh', () => {
333331
CopyProgress: 100,
334332
EndDate: '2024-02-22T00:37:46.000+0000',
335333
});
336-
const expectedCmdResponse = Object.assign({}, completeSbxProcess, {
337-
SandboxUsername: `${hubOrgUsername}.${sbxName}`,
338-
});
334+
const expectedCmdResponse = { ...completeSbxProcess, SandboxUsername: `${hubOrgUsername}.${sbxName}` };
339335
const connection = await stubProdOrgConnection(sinonSandbox, hubOrgUsername);
340336

341337
const singleRecordQueryStub = stubSingleRecordQuery({ sinonSandbox, connection, sandboxInfoSoql, sbxInfo });

test/nut/sandboxResume.nut.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,7 @@ describe('Sandbox Resume', () => {
133133
CopyProgress: 100,
134134
EndDate: '2024-02-22T00:37:46.000+0000',
135135
});
136-
const expectedCmdResponse = Object.assign({}, completeSbxProcess, {
137-
SandboxUsername: `${hubOrgUsername}.${sbxName}`,
138-
});
139-
// const sandboxProcessSoql = getSandboxProcessSoql({ Id: sbxProcess.Id });
140-
141-
// const connection = await stubProdOrgConnection(sinonSandbox, hubOrgUsername);
142-
// const toolingQueryStub = stubToolingQuery({ sinonSandbox, connection, sandboxProcessSoql, sbxProcess });
136+
const expectedCmdResponse = { ...completeSbxProcess, SandboxUsername: `${hubOrgUsername}.${sbxName}` };
143137

144138
// This call is used in polling; Org.pollStatusAndAuth()
145139
const querySandboxProcessByIdStub = sinonSandbox

0 commit comments

Comments
 (0)