@@ -330,10 +330,6 @@ describe('Dialog', () => {
330
330
let fix ;
331
331
let dialog ;
332
332
let detect ;
333
- const positionSettings : PositionSettings = {
334
- horizontalDirection : HorizontalAlignment . Center ,
335
- verticalDirection : VerticalAlignment . Top
336
- } ;
337
333
338
334
beforeEach ( fakeAsync ( ( ) => {
339
335
fix = TestBed . createComponent ( PositionSettingsDialogComponent ) ;
@@ -343,6 +339,7 @@ describe('Dialog', () => {
343
339
} ) ) ;
344
340
345
341
it ( 'Define different position settings ' , ( async ( ) => {
342
+ const currentElement = fix . componentInstance ;
346
343
dialog . open ( ) ;
347
344
fix . detectChanges ( ) ;
348
345
await wait ( 16 ) ;
@@ -359,7 +356,7 @@ describe('Dialog', () => {
359
356
await wait ( 16 ) ;
360
357
361
358
expect ( dialog . isOpen ) . toEqual ( false ) ;
362
- dialog . positionSettings = positionSettings ;
359
+ dialog . positionSettings = currentElement . newPositionSettings ;
363
360
fix . detectChanges ( ) ;
364
361
await wait ( 16 ) ;
365
362
@@ -383,28 +380,21 @@ describe('Dialog', () => {
383
380
384
381
it ( 'Set animation settings' , ( async ( ) => {
385
382
const currentElement = fix . componentInstance ;
386
- dialog . positionSettings = currentElement . animationSettings ;
387
- fix . detectChanges ( ) ;
388
- await wait ( 16 ) ;
389
383
390
- // Check the new animation settings
384
+ // Check initial animation settings
391
385
expect ( dialog . positionSettings . openAnimation . animation . type ) . toEqual ( 8 , 'Animation type is set' ) ;
392
- expect ( dialog . positionSettings . openAnimation . options . params . duration ) . toEqual ( '800ms ' , 'Animation duration is set to 800ms ' ) ;
386
+ expect ( dialog . positionSettings . openAnimation . options . params . duration ) . toEqual ( '200ms ' , 'Animation duration is set to 200ms ' ) ;
393
387
394
388
expect ( dialog . positionSettings . closeAnimation . animation . type ) . toEqual ( 8 , 'Animation type is set' ) ;
395
- expect ( dialog . positionSettings . closeAnimation . options . params . duration ) . toEqual ( '700ms' , 'Animation duration is set to 700ms' ) ;
396
-
397
- dialog . open ( ) ;
398
- fix . detectChanges ( ) ;
389
+ expect ( dialog . positionSettings . closeAnimation . options . params . duration ) . toEqual ( '200ms' , 'Animation duration is set to 200ms' ) ;
399
390
400
- await wait ( 16 ) ;
401
- expect ( dialog . isOpen ) . toEqual ( true ) ;
402
-
403
- dialog . close ( ) ;
391
+ dialog . positionSettings = currentElement . animationSettings ;
404
392
fix . detectChanges ( ) ;
405
393
await wait ( 16 ) ;
406
394
407
- expect ( dialog . isOpen ) . toEqual ( false ) ;
395
+ // Check the new animation settings
396
+ expect ( dialog . positionSettings . openAnimation . options . params . duration ) . toEqual ( '800ms' , 'Animation duration is set to 800ms' ) ;
397
+ expect ( dialog . positionSettings . closeAnimation . options . params . duration ) . toEqual ( '700ms' , 'Animation duration is set to 700ms' ) ;
408
398
} ) ) ;
409
399
} ) ;
410
400
@@ -535,11 +525,19 @@ class PositionSettingsDialogComponent {
535
525
horizontalDirection : HorizontalAlignment . Left ,
536
526
verticalDirection : VerticalAlignment . Middle ,
537
527
horizontalStartPoint : HorizontalAlignment . Left ,
538
- verticalStartPoint : VerticalAlignment . Middle
528
+ verticalStartPoint : VerticalAlignment . Middle ,
529
+ openAnimation : useAnimation ( slideInTop , { params : { duration : '200ms' } } ) ,
530
+ closeAnimation : useAnimation ( slideOutBottom , { params : { duration : '200ms' } } )
531
+ } ;
532
+
533
+ public newPositionSettings : PositionSettings = {
534
+ horizontalDirection : HorizontalAlignment . Center ,
535
+ verticalDirection : VerticalAlignment . Top
539
536
} ;
540
537
541
538
public animationSettings : PositionSettings = {
542
539
openAnimation : useAnimation ( slideInTop , { params : { duration : '800ms' } } ) ,
543
540
closeAnimation : useAnimation ( slideOutBottom , { params : { duration : '700ms' } } )
544
541
} ;
542
+
545
543
}
0 commit comments