Skip to content

Commit 3f1e72e

Browse files
vicheeyvicheey
committed
update prompter tester assert call all default case
1 parent 4bf1b1d commit 3f1e72e

File tree

4 files changed

+28
-25
lines changed

4 files changed

+28
-25
lines changed

‎packages/core/src/test/awsService/appBuilder/wizards/deployTypeWizard.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ describe('DeployTypeWizard', function () {
8080
const choices = await deployTypeWizard.run()
8181
// Then
8282
assert.strictEqual(choices?.choice, 'deploy')
83-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
83+
prompterTester.assertCallAll()
8484
})
8585

8686
it('sync is selected', async function () {
@@ -109,6 +109,6 @@ describe('DeployTypeWizard', function () {
109109
const choices = await deployTypeWizard.run()
110110
// Then
111111
assert.strictEqual(choices?.choice, 'sync')
112-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
112+
prompterTester.assertCallAll()
113113
})
114114
})

‎packages/core/src/test/shared/sam/deploy.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ describe('DeployWizard', async function () {
143143
assert.strictEqual(parameters.region, 'us-west-2')
144144
assert.strictEqual(parameters.stackName, 'stack1')
145145
assert.strictEqual(parameters.bucketSource, 0)
146-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
146+
prompterTester.assertCallAll()
147147
})
148148

149149
it('happy path with valid samconfig.toml', async () => {
@@ -195,7 +195,7 @@ describe('DeployWizard', async function () {
195195
assert(!parameters.region)
196196
assert(!parameters.stackName)
197197
assert(!parameters.bucketSource)
198-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
198+
prompterTester.assertCallAll()
199199
})
200200
})
201201

@@ -333,7 +333,7 @@ describe('DeployWizard', async function () {
333333
assert.strictEqual(parameters.region, 'us-west-2')
334334
assert(!parameters.stackName)
335335
assert(!parameters.bucketSource)
336-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
336+
prompterTester.assertCallAll()
337337
})
338338
})
339339

@@ -415,7 +415,7 @@ describe('DeployWizard', async function () {
415415
assert.strictEqual(parameters.stackName, 'stack2')
416416
assert.strictEqual(parameters.bucketSource, 0)
417417
assert(!parameters.bucketName)
418-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
418+
prompterTester.assertCallAll()
419419
})
420420

421421
it('happy path with valid samconfig.toml', async () => {
@@ -467,7 +467,7 @@ describe('DeployWizard', async function () {
467467
assert(!parameters.region)
468468
assert(!parameters.stackName)
469469
assert(!parameters.bucketSource)
470-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
470+
prompterTester.assertCallAll()
471471
})
472472
})
473473

@@ -549,7 +549,7 @@ describe('DeployWizard', async function () {
549549
assert.strictEqual(parameters.stackName, 'stack3')
550550
assert.strictEqual(parameters.bucketSource, 1)
551551
assert.strictEqual(parameters.bucketName, 'stack-3-bucket')
552-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
552+
prompterTester.assertCallAll()
553553
})
554554

555555
it('happy path with samconfig.toml', async () => {
@@ -602,7 +602,7 @@ describe('DeployWizard', async function () {
602602
assert(!parameters.region)
603603
assert(!parameters.stackName)
604604
assert(!parameters.bucketSource)
605-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
605+
prompterTester.assertCallAll()
606606
})
607607
})
608608
})

‎packages/core/src/test/shared/sam/sync.test.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,7 @@ describe('SyncWizard', async () => {
999999
assert.strictEqual(parameters.bucketName, 'stack-1-bucket')
10001000
assert.strictEqual(parameters.skipDependencyLayer, true)
10011001
assert.strictEqual(parameters.syncFlags, '["--dependency-layer","--use-container","--save-params"]')
1002-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
1002+
prompterTester.assertCallAll()
10031003
})
10041004

10051005
it('happy path with valid samconfig.toml', async () => {
@@ -1042,7 +1042,7 @@ describe('SyncWizard', async () => {
10421042
assert(!parameters.bucketName)
10431043
assert.strictEqual(parameters.skipDependencyLayer, true)
10441044
assert(!parameters.syncFlags)
1045-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
1045+
prompterTester.assertCallAll()
10461046
})
10471047
})
10481048

@@ -1122,7 +1122,7 @@ describe('SyncWizard', async () => {
11221122
assert.strictEqual(parameters.deployType, 'infra')
11231123
assert.strictEqual(parameters.skipDependencyLayer, true)
11241124
assert.strictEqual(parameters.syncFlags, '["--save-params"]')
1125-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
1125+
prompterTester.assertCallAll()
11261126
})
11271127

11281128
it('happy path with valid samconfig.toml', async () => {
@@ -1165,7 +1165,7 @@ describe('SyncWizard', async () => {
11651165
assert(!parameters.stackName)
11661166
assert(!parameters.bucketSource)
11671167
assert.strictEqual(parameters.skipDependencyLayer, true)
1168-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
1168+
prompterTester.assertCallAll()
11691169
})
11701170
})
11711171

@@ -1248,7 +1248,7 @@ describe('SyncWizard', async () => {
12481248
assert.strictEqual(parameters.deployType, 'infra')
12491249
assert.strictEqual(parameters.skipDependencyLayer, true)
12501250
assert.strictEqual(parameters.syncFlags, '["--dependency-layer","--use-container"]')
1251-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
1251+
prompterTester.assertCallAll()
12521252
})
12531253

12541254
it('happy path with valid samconfig.toml', async () => {
@@ -1298,7 +1298,7 @@ describe('SyncWizard', async () => {
12981298
assert(!parameters.stackName)
12991299
assert(!parameters.bucketSource)
13001300
assert.strictEqual(parameters.skipDependencyLayer, true)
1301-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
1301+
prompterTester.assertCallAll()
13021302
})
13031303
})
13041304

@@ -1347,7 +1347,7 @@ describe('SyncWizard', async () => {
13471347
assert.strictEqual(parameters.bucketName, 'aws-sam-cli-managed-default-samclisourcebucket-lftqponsaxsr')
13481348
assert.strictEqual(parameters.skipDependencyLayer, true)
13491349
assert(!parameters.syncFlags)
1350-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
1350+
prompterTester.assertCallAll()
13511351
})
13521352

13531353
it('happy path with empty samconfig.toml', async () => {
@@ -1421,7 +1421,7 @@ describe('SyncWizard', async () => {
14211421
assert.strictEqual(parameters.deployType, 'infra')
14221422
assert.strictEqual(parameters.skipDependencyLayer, true)
14231423
assert.strictEqual(parameters.syncFlags, '["--dependency-layer","--use-container","--watch"]')
1424-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
1424+
prompterTester.assertCallAll()
14251425
})
14261426
})
14271427

@@ -1497,7 +1497,7 @@ describe('SyncWizard', async () => {
14971497
assert.strictEqual(parameters.deployType, 'infra')
14981498
assert.strictEqual(parameters.skipDependencyLayer, true)
14991499
assert.strictEqual(parameters.syncFlags, '["--dependency-layer","--use-container"]')
1500-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
1500+
prompterTester.assertCallAll()
15011501
})
15021502

15031503
it('happy path with valid samconfig.toml', async () => {
@@ -1548,7 +1548,7 @@ describe('SyncWizard', async () => {
15481548
assert(!parameters.bucketSource)
15491549
assert(!parameters.syncFlags)
15501550
assert.strictEqual(parameters.skipDependencyLayer, true)
1551-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
1551+
prompterTester.assertCallAll()
15521552
})
15531553
})
15541554
})
@@ -1728,7 +1728,7 @@ describe('SAM Sync', () => {
17281728
syncedResources: 'CodeOnly',
17291729
source: undefined,
17301730
})
1731-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
1731+
prompterTester.assertCallAll()
17321732
})
17331733

17341734
it('[entry: template file] specify flag should instantiate correct process in terminal', async () => {
@@ -1804,7 +1804,7 @@ describe('SAM Sync', () => {
18041804
syncedResources: 'AllResources',
18051805
source: 'template',
18061806
})
1807-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
1807+
prompterTester.assertCallAll()
18081808
})
18091809

18101810
it('[entry: appBuilder] use samconfig should instantiate correct process in terminal', async () => {
@@ -1860,7 +1860,7 @@ describe('SAM Sync', () => {
18601860
syncedResources: 'AllResources',
18611861
source: 'appBuilderDeploy',
18621862
})
1863-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
1863+
prompterTester.assertCallAll()
18641864
})
18651865
})
18661866

@@ -1948,7 +1948,7 @@ describe('SAM Sync', () => {
19481948
assert(error instanceof ToolkitError)
19491949
assert.strictEqual(error.message, 'Failed to sync SAM application')
19501950
}
1951-
prompterTester.assertCallAll(prompterTester.getHandlers(), 1)
1951+
prompterTester.assertCallAll()
19521952
})
19531953
})
19541954
})

‎packages/core/src/test/shared/wizards/prompterTester.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,13 @@ export class PrompterTester {
7474
/**
7575
* Asserts that all specified prompter handlers were called in the expected number of times.
7676
*
77-
* @param expectedCall - The expected number of times the handler should have been called.
77+
* @param titles - The array of propmter handler titles to check.
78+
* If not provided, all registered handler titles are used
79+
* @param expectedCall - The expected number of times all specified handlers should have been called.
80+
* If not provided, it defaults to 1.
7881
* @throws AssertionError if the actual number of calls doesn't match the expected number.
7982
*/
80-
assertCallAll(titles: string[], expectedOrder: number) {
83+
assertCallAll(titles: string[] = this.getHandlers(), expectedOrder: number = 1) {
8184
titles.every((handler) => {
8285
this.assertCall(handler, expectedOrder)
8386
})

0 commit comments

Comments
 (0)