@@ -173,8 +173,8 @@ describe('deploy utils', () => {
173
173
174
174
await deployUtils . writeDeploymentStepLog ( mockDeploymentId , mockStep . name ) ;
175
175
176
- expect ( mockCallApi ) . toHaveBeenNthCalledWith ( 1 , 'get' , `deployments/${ mockDeploymentId } /steps` )
177
- expect ( mockCallApi ) . toHaveBeenNthCalledWith ( 2 , 'get' , `deployments/${ mockDeploymentId } /steps` )
176
+ expect ( mockCallApi ) . toHaveBeenNthCalledWith ( 1 , 'get' , `deployments/${ mockDeploymentId } /steps` ) ;
177
+ expect ( mockCallApi ) . toHaveBeenNthCalledWith ( 2 , 'get' , `deployments/${ mockDeploymentId } /steps` ) ;
178
178
} ) ;
179
179
180
180
it ( 'should retry when polling on deployment step log fails' , async ( ) => {
@@ -187,16 +187,24 @@ describe('deploy utils', () => {
187
187
188
188
await deployUtils . writeDeploymentStepLog ( mockDeploymentId , mockStep . name ) ;
189
189
190
- expect ( mockCallApi ) . toHaveBeenNthCalledWith ( 2 , 'get' , `deployments/${ mockDeploymentId } /steps/${ mockStep . name } /log` , {
191
- params : { startTime : undefined }
192
- } )
193
- expect ( mockCallApi ) . toHaveBeenNthCalledWith ( 3 , 'get' , `deployments/${ mockDeploymentId } /steps/${ mockStep . name } /log` , {
194
- params : { startTime : undefined }
195
- } )
190
+ expect ( mockCallApi ) . toHaveBeenNthCalledWith (
191
+ 2 ,
192
+ 'get' ,
193
+ `deployments/${ mockDeploymentId } /steps/${ mockStep . name } /log` ,
194
+ {
195
+ params : { startTime : undefined }
196
+ }
197
+ ) ;
198
+ expect ( mockCallApi ) . toHaveBeenNthCalledWith (
199
+ 3 ,
200
+ 'get' ,
201
+ `deployments/${ mockDeploymentId } /steps/${ mockStep . name } /log` ,
202
+ {
203
+ params : { startTime : undefined }
204
+ }
205
+ ) ;
196
206
} ) ;
197
- } )
198
-
199
-
207
+ } ) ;
200
208
} ) ;
201
209
202
210
describe ( 'create and deploy environment' , ( ) => {
@@ -284,26 +292,34 @@ describe('deploy utils', () => {
284
292
285
293
describe ( 'get environments' , ( ) => {
286
294
const environmentName = 'env0' ;
295
+ const environmentId = 'environmentId' ;
287
296
const projectId = 'projectX' ;
297
+
288
298
const environments = [ 'id1' , 'id2' , 'id3' ] . map ( id => ( { id } ) ) ;
289
299
let response ;
290
300
291
301
describe . each `
292
- when | apiResponse | expectedReturnValue
293
- ${ '' } | ${ environments } | ${ environments [ 0 ] }
294
- ${ 'NOT' } | ${ [ ] } | ${ undefined }
295
- ` ( 'when environment was $when found' , ( { apiResponse, expectedReturnValue } ) => {
296
- beforeEach ( async ( ) => {
297
- mockCallApi . mockReturnValue ( apiResponse ) ;
298
- response = await deployUtils . getEnvironment ( environmentName , projectId ) ;
299
- } ) ;
302
+ when | options | expectedApiPath
303
+ ${ '' } | ${ { environmentId, environmentName, projectId } } | ${ `environments/${ environmentId } ` }
304
+ ${ 'NOT' } | ${ { environmentName, projectId } } | ${ `environments?projectId=${ projectId } &name=${ environmentName } ` }
305
+ ` ( 'when environment id is $when specified' , ( { options, expectedApiPath } ) => {
306
+ describe . each `
307
+ when | apiResponse | expectedReturnValue
308
+ ${ '' } | ${ environments } | ${ environments [ 0 ] }
309
+ ${ 'NOT' } | ${ [ ] } | ${ undefined }
310
+ ` ( 'when environment was $when found' , ( { apiResponse, expectedReturnValue } ) => {
311
+ beforeEach ( async ( ) => {
312
+ mockCallApi . mockReturnValue ( apiResponse ) ;
313
+ response = await deployUtils . getEnvironment ( options ) ;
314
+ } ) ;
300
315
301
- it ( 'should call api' , async ( ) => {
302
- expect ( mockCallApi ) . toBeCalledWith ( 'get' , `environments?projectId= ${ projectId } &name= ${ environmentName } ` ) ;
303
- } ) ;
316
+ it ( 'should call api' , async ( ) => {
317
+ expect ( mockCallApi ) . toBeCalledWith ( 'get' , expectedApiPath ) ;
318
+ } ) ;
304
319
305
- it ( `should return ${ expectedReturnValue } ` , ( ) => {
306
- expect ( response ) . toEqual ( expectedReturnValue ) ;
320
+ it ( `should return ${ expectedReturnValue } ` , ( ) => {
321
+ expect ( response ) . toEqual ( expectedReturnValue ) ;
322
+ } ) ;
307
323
} ) ;
308
324
} ) ;
309
325
} ) ;
0 commit comments