Skip to content

Commit 0b93b69

Browse files
committed
fix: test failure
1 parent e440a6b commit 0b93b69

7 files changed

Lines changed: 132 additions & 108 deletions

File tree

test/commands/project/deploy/pipeline/quick.test.ts

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -118,20 +118,21 @@ describe('project deploy pipeline quick', () => {
118118
}
119119

120120
before(async () => {
121-
const mod = await esmock(
122-
'../../../../../src/commands/project/deploy/pipeline/quick.js',
123-
{},
124-
{
125-
'../../../../../src/common/utils.js': {
126-
getAsyncOperationStreamer: getAsyncOperationStreamerStub,
127-
fetchAsyncOperationResult: fetchAsyncOperationResultStub,
128-
},
129-
'../../../../../src/common/outputService/outputServiceFactory.js': {
130-
OutputServiceFactory: MockOutputServiceFactory,
131-
},
132-
'@salesforce/core': await import('@salesforce/core'),
133-
}
134-
);
121+
const mockedAsyncOp = await esmock('../../../../../src/common/base/abstractAsyncOperation.js', {
122+
'../../../../../src/common/index.js': {
123+
fetchAsyncOperationResult: fetchAsyncOperationResultStub,
124+
getAsyncOperationStreamer: getAsyncOperationStreamerStub,
125+
},
126+
});
127+
const mockedQuick = await esmock('../../../../../src/common/base/abstractQuick.js', {
128+
'../../../../../src/common/base/abstractAsyncOperation.js': mockedAsyncOp,
129+
'../../../../../src/common/outputService/index.js': {
130+
OutputServiceFactory: MockOutputServiceFactory,
131+
},
132+
});
133+
const mod = await esmock('../../../../../src/commands/project/deploy/pipeline/quick.js', {
134+
'../../../../../src/common/base/abstractQuick.js': mockedQuick,
135+
});
135136
QuickCommand = mod.default;
136137
});
137138

test/commands/project/deploy/pipeline/report.test.ts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,14 @@ describe('project deploy pipeline report', () => {
4545
const selectOneDeploymentResultByAsyncJobIdStub = sinon.stub();
4646

4747
before(async () => {
48-
const mod = await esmock(
49-
'../../../../../src/commands/project/deploy/pipeline/report.js',
50-
{},
51-
{
52-
'../../../../../src/common/selectors/deploymentResultsSelector.js': {
53-
selectOneDeploymentResultByAsyncJobId: selectOneDeploymentResultByAsyncJobIdStub,
54-
},
55-
'@salesforce/core': await import('@salesforce/core'),
56-
}
57-
);
48+
const mockedReportBase = await esmock('../../../../../src/common/base/abstractReportOnPromote.js', {
49+
'../../../../../src/common/selectors/deploymentResultsSelector.js': {
50+
selectOneDeploymentResultByAsyncJobId: selectOneDeploymentResultByAsyncJobIdStub,
51+
},
52+
});
53+
const mod = await esmock('../../../../../src/commands/project/deploy/pipeline/report.js', {
54+
'../../../../../src/common/base/abstractReportOnPromote.js': mockedReportBase,
55+
});
5856
ReportCommand = mod.default;
5957
});
6058

test/commands/project/deploy/pipeline/resume.test.ts

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,20 +92,27 @@ describe('project deploy pipeline resume', () => {
9292
}
9393

9494
before(async () => {
95-
const mod = await esmock(
96-
'../../../../../src/commands/project/deploy/pipeline/resume.js',
97-
{},
98-
{
99-
'../../../../../src/common/utils.js': {
100-
getAsyncOperationStreamer: getAsyncOperationStreamerStub,
101-
fetchAsyncOperationResult: fetchAsyncOperationResultStub,
102-
},
103-
'../../../../../src/common/outputService/outputServiceFactory.js': {
104-
OutputServiceFactory: MockOutputServiceFactory,
105-
},
106-
'@salesforce/core': await import('@salesforce/core'),
107-
}
108-
);
95+
const realCommonIndex = await import('../../../../../src/common/index.js');
96+
const mockedAsyncOp = await esmock('../../../../../src/common/base/abstractAsyncOperation.js', {
97+
'../../../../../src/common/index.js': {
98+
...realCommonIndex,
99+
fetchAsyncOperationResult: fetchAsyncOperationResultStub,
100+
getAsyncOperationStreamer: getAsyncOperationStreamerStub,
101+
},
102+
});
103+
const mockedResume = await esmock('../../../../../src/common/base/abstractResume.js', {
104+
'../../../../../src/common/base/abstractAsyncOperation.js': mockedAsyncOp,
105+
'../../../../../src/common/index.js': {
106+
...realCommonIndex,
107+
fetchAsyncOperationResult: fetchAsyncOperationResultStub,
108+
},
109+
'../../../../../src/common/outputService/index.js': {
110+
OutputServiceFactory: MockOutputServiceFactory,
111+
},
112+
});
113+
const mod = await esmock('../../../../../src/commands/project/deploy/pipeline/resume.js', {
114+
'../../../../../src/common/base/abstractResume.js': mockedResume,
115+
});
109116
ResumeCmd = mod.default;
110117
});
111118

test/commands/project/deploy/pipeline/start.test.ts

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -108,24 +108,29 @@ describe('project deploy pipeline start', () => {
108108
}
109109

110110
before(async () => {
111-
const mod = await esmock(
112-
'../../../../../src/commands/project/deploy/pipeline/start.js',
113-
{},
114-
{
115-
'../../../../../src/common/utils.js': {
116-
fetchAndValidatePipelineStage: esmockFetchAndValidateStub,
117-
fetchAsyncOperationResult: esmockFetchAsyncOpResultStub,
118-
sleep: esmockSleepStub,
119-
},
120-
'../../../../../src/common/selectors/asyncOperationResultsSelector.js': {
121-
selectAsyncOperationResultById: esmockSelectAorByIdStub,
122-
},
123-
'../../../../../src/common/outputService/outputServiceFactory.js': {
124-
OutputServiceFactory: MockOutputServiceFactory,
125-
},
126-
'@salesforce/core': await import('@salesforce/core'),
127-
}
128-
);
111+
const realCommonIndex = await import('../../../../../src/common/index.js');
112+
const mockedAsyncOp = await esmock('../../../../../src/common/base/abstractAsyncOperation.js', {
113+
'../../../../../src/common/index.js': {
114+
...realCommonIndex,
115+
fetchAsyncOperationResult: esmockFetchAsyncOpResultStub,
116+
},
117+
});
118+
const mockedPromote = await esmock('../../../../../src/common/base/abstractPromote.js', {
119+
'../../../../../src/common/base/abstractAsyncOperation.js': mockedAsyncOp,
120+
'../../../../../src/common/index.js': {
121+
...realCommonIndex,
122+
fetchAndValidatePipelineStage: esmockFetchAndValidateStub,
123+
},
124+
'../../../../../src/common/utils.js': {
125+
sleep: esmockSleepStub,
126+
},
127+
'../../../../../src/common/outputService/index.js': {
128+
OutputServiceFactory: MockOutputServiceFactory,
129+
},
130+
});
131+
const mod = await esmock('../../../../../src/commands/project/deploy/pipeline/start.js', {
132+
'../../../../../src/common/base/abstractPromote.js': mockedPromote,
133+
});
129134
StartCommand = mod.default;
130135
});
131136

test/commands/project/deploy/pipeline/validate.test.ts

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,20 +88,29 @@ describe('project deploy pipeline validate', () => {
8888
}
8989

9090
before(async () => {
91-
const mod = await esmock(
92-
'../../../../../src/commands/project/deploy/pipeline/validate.js',
93-
{},
94-
{
95-
'../../../../../src/common/utils.js': {
96-
fetchAndValidatePipelineStage: fetchAndValidatePipelineStageStub,
97-
fetchAsyncOperationResult: fetchAsyncOperationResultStub,
98-
},
99-
'../../../../../src/common/outputService/outputServiceFactory.js': {
100-
OutputServiceFactory: MockOutputServiceFactory,
101-
},
102-
'@salesforce/core': await import('@salesforce/core'),
103-
}
104-
);
91+
const realCommonIndex = await import('../../../../../src/common/index.js');
92+
const mockedAsyncOp = await esmock('../../../../../src/common/base/abstractAsyncOperation.js', {
93+
'../../../../../src/common/index.js': {
94+
...realCommonIndex,
95+
fetchAsyncOperationResult: fetchAsyncOperationResultStub,
96+
},
97+
});
98+
const mockedPromote = await esmock('../../../../../src/common/base/abstractPromote.js', {
99+
'../../../../../src/common/base/abstractAsyncOperation.js': mockedAsyncOp,
100+
'../../../../../src/common/index.js': {
101+
...realCommonIndex,
102+
fetchAndValidatePipelineStage: fetchAndValidatePipelineStageStub,
103+
},
104+
'../../../../../src/common/outputService/index.js': {
105+
OutputServiceFactory: MockOutputServiceFactory,
106+
},
107+
});
108+
const mockedStart = await esmock('../../../../../src/commands/project/deploy/pipeline/start.js', {
109+
'../../../../../src/common/base/abstractPromote.js': mockedPromote,
110+
});
111+
const mod = await esmock('../../../../../src/commands/project/deploy/pipeline/validate.js', {
112+
'../../../../../src/commands/project/deploy/pipeline/start.js': mockedStart,
113+
});
105114
ValidateCommand = mod.default;
106115
});
107116

test/common/outputService/promoteOutputService.test.ts

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -45,31 +45,37 @@ describe('promoteOutputService', () => {
4545
const getFormattedDeployComponentsByAyncOpIdStub = sinon.stub();
4646

4747
before(async () => {
48-
const mod = await esmock(
49-
'../../../src/common/outputService/index.js',
50-
{},
51-
{
52-
'../../../src/common/selectors/deployProgressSummarySelector.js': {
53-
selectDeployAORSummaryDataById: selectDeployAORSummaryDataByIdStub,
54-
},
55-
'../../../src/common/selectors/environmentSelector.js': {
56-
selectPipelineStageByEnvironment: selectPipelineStageByEnvironmentStub,
57-
},
58-
'../../../src/common/selectors/workItemSelector.js': {
59-
selectWorkItemsByChangeBundles: selectWorkItemsByChangeBundlesStub,
60-
},
61-
'../../../src/common/selectors/deploymentResultsSelector.js': {
62-
isCheckDeploy: isCheckDeployStub,
63-
},
64-
'../../../src/common/selectors/validateDeploySelector.js': {
65-
selectValidateDeployAORSummaryDataById: selectValidateDeployAORSummaryDataByIdStub,
66-
},
67-
'../../../src/common/utils.js': {
68-
getFormattedDeployComponentsByAyncOpId: getFormattedDeployComponentsByAyncOpIdStub,
69-
},
70-
'@salesforce/core': await import('@salesforce/core'),
71-
}
72-
);
48+
const mockedDeploySummaryBuilder = await esmock('../../../src/common/outputService/deploySummaryBuilder.js', {
49+
'../../../src/common/selectors/deployProgressSummarySelector.js': {
50+
selectDeployAORSummaryDataById: selectDeployAORSummaryDataByIdStub,
51+
},
52+
'../../../src/common/selectors/environmentSelector.js': {
53+
selectPipelineStageByEnvironment: selectPipelineStageByEnvironmentStub,
54+
},
55+
'../../../src/common/selectors/workItemSelector.js': {
56+
selectWorkItemsByChangeBundles: selectWorkItemsByChangeBundlesStub,
57+
},
58+
'../../../src/common/selectors/validateDeploySelector.js': {
59+
selectValidateDeployAORSummaryDataById: selectValidateDeployAORSummaryDataByIdStub,
60+
},
61+
});
62+
const mockedResumeOutputService = await esmock('../../../src/common/outputService/resumeOutputService.js', {
63+
'../../../src/common/selectors/deploymentResultsSelector.js': {
64+
isCheckDeploy: isCheckDeployStub,
65+
},
66+
'../../../src/common/utils.js': {
67+
getFormattedDeployComponentsByAyncOpId: getFormattedDeployComponentsByAyncOpIdStub,
68+
},
69+
});
70+
const mockedPromoteOutputService = await esmock('../../../src/common/outputService/promoteOutputService.js', {
71+
'../../../src/common/outputService/deploySummaryBuilder.js': mockedDeploySummaryBuilder,
72+
'../../../src/common/outputService/resumeOutputService.js': mockedResumeOutputService,
73+
});
74+
const mod = await esmock('../../../src/common/outputService/index.js', {
75+
'../../../src/common/outputService/deploySummaryBuilder.js': mockedDeploySummaryBuilder,
76+
'../../../src/common/outputService/promoteOutputService.js': mockedPromoteOutputService,
77+
'../../../src/common/outputService/resumeOutputService.js': mockedResumeOutputService,
78+
});
7379
AbstractPromoteOutputServiceClass = mod.AbstractPromoteOutputService;
7480
DeploySummaryBuilderClass = mod.DeploySummaryBuilder;
7581
});

test/common/outputService/resumeCommandOutputService.test.ts

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,17 @@ describe('resume output', () => {
3535
const isCheckDeployStub = sinon.stub();
3636

3737
before(async () => {
38-
const mod = await esmock(
39-
'../../../src/common/outputService/resumeCommandOutputService.js',
40-
{},
41-
{
42-
'../../../src/common/utils.js': {
43-
getFormattedDeployComponentsByAyncOpId: getFormattedDeployComponentsByAyncOpIdStub,
44-
},
45-
'../../../src/common/selectors/deploymentResultsSelector.js': {
46-
isCheckDeploy: isCheckDeployStub,
47-
},
48-
'@salesforce/core': await import('@salesforce/core'),
49-
}
50-
);
38+
const mockedResumeOutputService = await esmock('../../../src/common/outputService/resumeOutputService.js', {
39+
'../../../src/common/selectors/deploymentResultsSelector.js': {
40+
isCheckDeploy: isCheckDeployStub,
41+
},
42+
'../../../src/common/utils.js': {
43+
getFormattedDeployComponentsByAyncOpId: getFormattedDeployComponentsByAyncOpIdStub,
44+
},
45+
});
46+
const mod = await esmock('../../../src/common/outputService/resumeCommandOutputService.js', {
47+
'../../../src/common/outputService/resumeOutputService.js': mockedResumeOutputService,
48+
});
5149
ResumeCommandOutputServiceClass = mod.ResumeCommandOutputService;
5250
});
5351

0 commit comments

Comments
 (0)