@@ -931,7 +931,9 @@ describe('Test gl3d drag and wheel interactions', function() {
931931 } ) ;
932932
933933 it ( '@gl should fire plotly_relayouting events' , function ( done ) {
934- var sceneLayout , sceneTarget , relayoutCallback , relayoutingCallback ;
934+ var sceneTarget , relayoutEvent ;
935+ var relayoutCnt = 0 ;
936+ var events = [ ] ;
935937
936938 var mock = {
937939 data : [
@@ -959,20 +961,24 @@ describe('Test gl3d drag and wheel interactions', function() {
959961
960962 Plotly . plot ( gd , mock )
961963 . then ( function ( ) {
962- relayoutCallback = jasmine . createSpy ( 'relayoutCallback' ) ;
963- gd . on ( 'plotly_relayout' , relayoutCallback ) ;
964-
965- relayoutingCallback = jasmine . createSpy ( 'relayoutingCallback' ) ;
966- gd . on ( 'plotly_relayouting' , relayoutingCallback ) ;
964+ gd . on ( 'plotly_relayout' , function ( e ) {
965+ relayoutCnt ++ ;
966+ relayoutEvent = e ;
967+ } ) ;
968+ gd . on ( 'plotly_relayouting' , function ( e ) {
969+ events . push ( e ) ;
970+ } ) ;
967971
968- sceneLayout = gd . _fullLayout . scene ;
969972 sceneTarget = gd . querySelector ( '.svg-container .gl-container #scene canvas' ) ;
970973
971974 return _drag ( sceneTarget , [ 200 , 200 ] , [ 100 , 100 ] , nsteps ) ;
972975 } )
973976 . then ( function ( ) {
974- expect ( relayoutCallback ) . toHaveBeenCalledTimes ( 1 ) ;
975- expect ( relayoutingCallback ) . toHaveBeenCalledTimes ( nsteps ) ;
977+ expect ( events . length ) . toEqual ( nsteps ) ;
978+ expect ( relayoutCnt ) . toEqual ( 1 ) ;
979+ Object . keys ( relayoutEvent ) . sort ( ) . forEach ( function ( key ) {
980+ expect ( Object . keys ( events [ 0 ] ) ) . toContain ( key ) ;
981+ } ) ;
976982 } )
977983 . catch ( failTest )
978984 . then ( done ) ;
0 commit comments