@@ -34,10 +34,12 @@ const defaultChangeset = {
34
34
const defaultComponents = {
35
35
Alpha : [ 'Beta' ] ,
36
36
Gamma : [ 'Delta' , 'Theta' ] ,
37
+ Zam : [ ] ,
37
38
} ;
38
39
39
40
const defaultIgnored = {
40
41
Bang : [ 'Bazinga' ] ,
42
+ Zam : [ 'Garnish' ] ,
41
43
} ;
42
44
43
45
const defaultDirs = { config : [ 'foo/bar' ] , pre : [ 'buz/baz' ] } ;
@@ -291,6 +293,7 @@ describe('<RetrieveMetadataModal/>', () => {
291
293
getByLabelText ( 'Baz' ) ,
292
294
getByLabelText ( 'Bing' ) ,
293
295
getByLabelText ( 'Bazinga' ) ,
296
+ getByLabelText ( 'Garnish' ) ,
294
297
getByLabelText ( 'Beta' ) ,
295
298
] ;
296
299
} ) ;
@@ -304,22 +307,25 @@ describe('<RetrieveMetadataModal/>', () => {
304
307
expect ( inputs [ 2 ] . checked ) . toBe ( true ) ;
305
308
expect ( inputs [ 3 ] . checked ) . toBe ( false ) ;
306
309
expect ( inputs [ 4 ] . checked ) . toBe ( false ) ;
310
+ expect ( inputs [ 5 ] . checked ) . toBe ( false ) ;
307
311
308
312
fireEvent . click ( selectAllIgnored ) ;
309
313
310
314
expect ( inputs [ 0 ] . checked ) . toBe ( true ) ;
311
315
expect ( inputs [ 1 ] . checked ) . toBe ( true ) ;
312
316
expect ( inputs [ 2 ] . checked ) . toBe ( true ) ;
313
317
expect ( inputs [ 3 ] . checked ) . toBe ( true ) ;
314
- expect ( inputs [ 4 ] . checked ) . toBe ( false ) ;
318
+ expect ( inputs [ 4 ] . checked ) . toBe ( true ) ;
319
+ expect ( inputs [ 5 ] . checked ) . toBe ( false ) ;
315
320
316
321
fireEvent . click ( selectAll ) ;
317
322
318
323
expect ( inputs [ 0 ] . checked ) . toBe ( false ) ;
319
324
expect ( inputs [ 1 ] . checked ) . toBe ( false ) ;
320
325
expect ( inputs [ 2 ] . checked ) . toBe ( false ) ;
321
326
expect ( inputs [ 3 ] . checked ) . toBe ( true ) ;
322
- expect ( inputs [ 4 ] . checked ) . toBe ( false ) ;
327
+ expect ( inputs [ 4 ] . checked ) . toBe ( true ) ;
328
+ expect ( inputs [ 5 ] . checked ) . toBe ( false ) ;
323
329
324
330
fireEvent . click ( selectAllIgnored ) ;
325
331
@@ -328,6 +334,7 @@ describe('<RetrieveMetadataModal/>', () => {
328
334
expect ( inputs [ 2 ] . checked ) . toBe ( false ) ;
329
335
expect ( inputs [ 3 ] . checked ) . toBe ( false ) ;
330
336
expect ( inputs [ 4 ] . checked ) . toBe ( false ) ;
337
+ expect ( inputs [ 5 ] . checked ) . toBe ( false ) ;
331
338
} ) ;
332
339
} ) ;
333
340
@@ -340,6 +347,7 @@ describe('<RetrieveMetadataModal/>', () => {
340
347
expect ( inputs [ 2 ] . checked ) . toBe ( true ) ;
341
348
expect ( inputs [ 3 ] . checked ) . toBe ( false ) ;
342
349
expect ( inputs [ 4 ] . checked ) . toBe ( false ) ;
350
+ expect ( inputs [ 5 ] . checked ) . toBe ( false ) ;
343
351
344
352
fireEvent . click ( group2 ) ;
345
353
@@ -348,6 +356,7 @@ describe('<RetrieveMetadataModal/>', () => {
348
356
expect ( inputs [ 2 ] . checked ) . toBe ( true ) ;
349
357
expect ( inputs [ 3 ] . checked ) . toBe ( true ) ;
350
358
expect ( inputs [ 4 ] . checked ) . toBe ( false ) ;
359
+ expect ( inputs [ 5 ] . checked ) . toBe ( false ) ;
351
360
352
361
fireEvent . click ( group1 ) ;
353
362
@@ -356,6 +365,7 @@ describe('<RetrieveMetadataModal/>', () => {
356
365
expect ( inputs [ 2 ] . checked ) . toBe ( false ) ;
357
366
expect ( inputs [ 3 ] . checked ) . toBe ( true ) ;
358
367
expect ( inputs [ 4 ] . checked ) . toBe ( false ) ;
368
+ expect ( inputs [ 5 ] . checked ) . toBe ( false ) ;
359
369
360
370
fireEvent . click ( group2 ) ;
361
371
@@ -364,13 +374,15 @@ describe('<RetrieveMetadataModal/>', () => {
364
374
expect ( inputs [ 2 ] . checked ) . toBe ( false ) ;
365
375
expect ( inputs [ 3 ] . checked ) . toBe ( false ) ;
366
376
expect ( inputs [ 4 ] . checked ) . toBe ( false ) ;
377
+ expect ( inputs [ 5 ] . checked ) . toBe ( false ) ;
367
378
368
379
fireEvent . click ( group3 ) ;
369
380
expect ( inputs [ 0 ] . checked ) . toBe ( false ) ;
370
381
expect ( inputs [ 1 ] . checked ) . toBe ( false ) ;
371
382
expect ( inputs [ 2 ] . checked ) . toBe ( false ) ;
372
383
expect ( inputs [ 3 ] . checked ) . toBe ( false ) ;
373
- expect ( inputs [ 4 ] . checked ) . toBe ( true ) ;
384
+ expect ( inputs [ 4 ] . checked ) . toBe ( false ) ;
385
+ expect ( inputs [ 5 ] . checked ) . toBe ( true ) ;
374
386
} ) ;
375
387
} ) ;
376
388
@@ -468,14 +480,16 @@ describe('<RetrieveMetadataModal/>', () => {
468
480
expect ( panels [ 1 ] ) . toHaveAttribute ( 'aria-hidden' , 'true' ) ;
469
481
expect ( panels [ 2 ] ) . toHaveAttribute ( 'aria-hidden' , 'false' ) ;
470
482
expect ( panels [ 3 ] ) . toHaveAttribute ( 'aria-hidden' , 'false' ) ;
471
- expect ( panels [ 4 ] ) . toHaveAttribute ( 'aria-hidden' , 'false' ) ;
483
+ expect ( panels [ 4 ] ) . toHaveAttribute ( 'aria-hidden' , 'true' ) ;
484
+ expect ( panels [ 5 ] ) . toHaveAttribute ( 'aria-hidden' , 'false' ) ;
472
485
473
486
fireEvent . click ( getByTitle ( 'Alpha' ) ) ;
474
487
expect ( panels [ 0 ] ) . toHaveAttribute ( 'aria-hidden' , 'false' ) ;
475
488
expect ( panels [ 1 ] ) . toHaveAttribute ( 'aria-hidden' , 'true' ) ;
476
489
expect ( panels [ 2 ] ) . toHaveAttribute ( 'aria-hidden' , 'false' ) ;
477
490
expect ( panels [ 3 ] ) . toHaveAttribute ( 'aria-hidden' , 'false' ) ;
478
491
expect ( panels [ 4 ] ) . toHaveAttribute ( 'aria-hidden' , 'true' ) ;
492
+ expect ( panels [ 5 ] ) . toHaveAttribute ( 'aria-hidden' , 'true' ) ;
479
493
} ) ;
480
494
} ) ;
481
495
} ) ;
@@ -495,6 +509,20 @@ describe('<RetrieveMetadataModal/>', () => {
495
509
expect ( nonSourceTrackableElement ) . not . toBeNull ( ) ;
496
510
} ) ;
497
511
512
+ test ( 'ignore changes for non-source-trackable' , ( ) => {
513
+ const { getByText, rerender, store } = setup ( ) ;
514
+ fireEvent . click ( getByText ( 'Save & Next' ) ) ;
515
+ setup ( {
516
+ org : {
517
+ ...defaultOrg ,
518
+ ignored_changes : { Alpha : [ 'Beta' ] } ,
519
+ non_source_changes : { Gamma : [ 'Delta' ] } ,
520
+ } ,
521
+ store,
522
+ rerender,
523
+ } ) ;
524
+ } ) ;
525
+
498
526
describe ( 'commit message' , ( ) => {
499
527
let getters ;
500
528
0 commit comments