@@ -330,10 +330,6 @@ describe('Dialog', () => {
330330 let fix ;
331331 let dialog ;
332332 let detect ;
333- const positionSettings : PositionSettings = {
334- horizontalDirection : HorizontalAlignment . Center ,
335- verticalDirection : VerticalAlignment . Top
336- } ;
337333
338334 beforeEach ( fakeAsync ( ( ) => {
339335 fix = TestBed . createComponent ( PositionSettingsDialogComponent ) ;
@@ -343,6 +339,7 @@ describe('Dialog', () => {
343339 } ) ) ;
344340
345341 it ( 'Define different position settings ' , ( async ( ) => {
342+ const currentElement = fix . componentInstance ;
346343 dialog . open ( ) ;
347344 fix . detectChanges ( ) ;
348345 await wait ( 16 ) ;
@@ -359,7 +356,7 @@ describe('Dialog', () => {
359356 await wait ( 16 ) ;
360357
361358 expect ( dialog . isOpen ) . toEqual ( false ) ;
362- dialog . positionSettings = positionSettings ;
359+ dialog . positionSettings = currentElement . newPositionSettings ;
363360 fix . detectChanges ( ) ;
364361 await wait ( 16 ) ;
365362
@@ -383,28 +380,21 @@ describe('Dialog', () => {
383380
384381 it ( 'Set animation settings' , ( async ( ) => {
385382 const currentElement = fix . componentInstance ;
386- dialog . positionSettings = currentElement . animationSettings ;
387- fix . detectChanges ( ) ;
388- await wait ( 16 ) ;
389383
390- // Check the new animation settings
384+ // Check initial animation settings
391385 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 ' ) ;
393387
394388 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' ) ;
399390
400- await wait ( 16 ) ;
401- expect ( dialog . isOpen ) . toEqual ( true ) ;
402-
403- dialog . close ( ) ;
391+ dialog . positionSettings = currentElement . animationSettings ;
404392 fix . detectChanges ( ) ;
405393 await wait ( 16 ) ;
406394
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' ) ;
408398 } ) ) ;
409399 } ) ;
410400
@@ -535,11 +525,19 @@ class PositionSettingsDialogComponent {
535525 horizontalDirection : HorizontalAlignment . Left ,
536526 verticalDirection : VerticalAlignment . Middle ,
537527 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
539536 } ;
540537
541538 public animationSettings : PositionSettings = {
542539 openAnimation : useAnimation ( slideInTop , { params : { duration : '800ms' } } ) ,
543540 closeAnimation : useAnimation ( slideOutBottom , { params : { duration : '700ms' } } )
544541 } ;
542+
545543}
0 commit comments