@@ -178,7 +178,9 @@ describe('pie hovering', function() {
178
178
var fields = [
179
179
'v' , 'label' , 'color' , 'i' , 'hidden' ,
180
180
'text' , 'px1' , 'pxmid' , 'midangle' ,
181
- 'px0' , 'largeArc' , 'cxFinal' , 'cyFinal' ,
181
+ 'px0' , 'largeArc' ,
182
+ 'pointNumber' , 'curveNumber' ,
183
+ 'cxFinal' , 'cyFinal' ,
182
184
'originalEvent'
183
185
] ;
184
186
@@ -392,18 +394,22 @@ describe('Test event property of interactions on a pie plot:', function() {
392
394
expect ( typeof trace ) . toEqual ( typeof { } , 'points.trace' ) ;
393
395
394
396
var pt = futureData . points [ 0 ] ;
395
- expect ( Object . keys ( pt ) ) . toEqual ( [
397
+ expect ( Object . keys ( pt ) ) . toEqual ( jasmine . arrayContaining ( [
396
398
'v' , 'label' , 'color' , 'i' , 'hidden' , 'vTotal' , 'text' , 't' ,
397
399
'trace' , 'r' , 'cx' , 'cy' , 'px1' , 'pxmid' , 'midangle' , 'px0' ,
398
- 'largeArc' , 'cxFinal' , 'cyFinal'
399
- ] ) ;
400
+ 'largeArc' , 'cxFinal' , 'cyFinal' ,
401
+ 'pointNumber' , 'curveNumber'
402
+ ] ) ) ;
403
+ expect ( Object . keys ( pt ) . length ) . toBe ( 21 ) ;
404
+
400
405
expect ( typeof pt . color ) . toEqual ( typeof '#1f77b4' , 'points[0].color' ) ;
401
406
expect ( pt . cx ) . toEqual ( 200 , 'points[0].cx' ) ;
402
407
expect ( pt . cxFinal ) . toEqual ( 200 , 'points[0].cxFinal' ) ;
403
408
expect ( pt . cy ) . toEqual ( 160 , 'points[0].cy' ) ;
404
409
expect ( pt . cyFinal ) . toEqual ( 160 , 'points[0].cyFinal' ) ;
405
410
expect ( pt . hidden ) . toEqual ( false , 'points[0].hidden' ) ;
406
411
expect ( pt . i ) . toEqual ( 4 , 'points[0].i' ) ;
412
+ expect ( pt . pointNumber ) . toEqual ( 4 , 'points[0].pointNumber' ) ;
407
413
expect ( pt . label ) . toEqual ( '4' , 'points[0].label' ) ;
408
414
expect ( pt . largeArc ) . toEqual ( 0 , 'points[0].largeArc' ) ;
409
415
expect ( pt . midangle ) . toEqual ( 1.0471975511965976 , 'points[0].midangle' ) ;
@@ -416,6 +422,7 @@ describe('Test event property of interactions on a pie plot:', function() {
416
422
expect ( typeof pt . trace ) . toEqual ( typeof { } , 'points[0].trace' ) ;
417
423
expect ( pt . v ) . toEqual ( 5 , 'points[0].v' ) ;
418
424
expect ( pt . vTotal ) . toEqual ( 15 , 'points[0].vTotal' ) ;
425
+ expect ( pt . curveNumber ) . toEqual ( 0 , 'points[0].curveNumber' ) ;
419
426
420
427
var evt = futureData . event ;
421
428
expect ( evt . clientX ) . toEqual ( pointPos [ 0 ] , 'event.clientX' ) ;
@@ -453,18 +460,21 @@ describe('Test event property of interactions on a pie plot:', function() {
453
460
expect ( typeof trace ) . toEqual ( typeof { } , 'points.trace' ) ;
454
461
455
462
var pt = futureData . points [ 0 ] ;
456
- expect ( Object . keys ( pt ) ) . toEqual ( [
463
+ expect ( Object . keys ( pt ) ) . toEqual ( jasmine . arrayContaining ( [
457
464
'v' , 'label' , 'color' , 'i' , 'hidden' , 'vTotal' , 'text' , 't' ,
458
465
'trace' , 'r' , 'cx' , 'cy' , 'px1' , 'pxmid' , 'midangle' , 'px0' ,
459
- 'largeArc' , 'cxFinal' , 'cyFinal'
460
- ] ) ;
466
+ 'largeArc' , 'cxFinal' , 'cyFinal' ,
467
+ 'pointNumber' , 'curveNumber'
468
+ ] ) ) ;
469
+
461
470
expect ( typeof pt . color ) . toEqual ( typeof '#1f77b4' , 'points[0].color' ) ;
462
471
expect ( pt . cx ) . toEqual ( 200 , 'points[0].cx' ) ;
463
472
expect ( pt . cxFinal ) . toEqual ( 200 , 'points[0].cxFinal' ) ;
464
473
expect ( pt . cy ) . toEqual ( 160 , 'points[0].cy' ) ;
465
474
expect ( pt . cyFinal ) . toEqual ( 160 , 'points[0].cyFinal' ) ;
466
475
expect ( pt . hidden ) . toEqual ( false , 'points[0].hidden' ) ;
467
476
expect ( pt . i ) . toEqual ( 4 , 'points[0].i' ) ;
477
+ expect ( pt . pointNumber ) . toEqual ( 4 , 'points[0].pointNumber' ) ;
468
478
expect ( pt . label ) . toEqual ( '4' , 'points[0].label' ) ;
469
479
expect ( pt . largeArc ) . toEqual ( 0 , 'points[0].largeArc' ) ;
470
480
expect ( pt . midangle ) . toEqual ( 1.0471975511965976 , 'points[0].midangle' ) ;
@@ -477,6 +487,7 @@ describe('Test event property of interactions on a pie plot:', function() {
477
487
expect ( typeof pt . trace ) . toEqual ( typeof { } , 'points[0].trace' ) ;
478
488
expect ( pt . v ) . toEqual ( 5 , 'points[0].v' ) ;
479
489
expect ( pt . vTotal ) . toEqual ( 15 , 'points[0].vTotal' ) ;
490
+ expect ( pt . curveNumber ) . toEqual ( 0 , 'points[0].curveNumber' ) ;
480
491
481
492
var evt = futureData . event ;
482
493
expect ( evt . clientX ) . toEqual ( pointPos [ 0 ] , 'event.clientX' ) ;
0 commit comments