Skip to content

Commit 261387d

Browse files
etpinardetpinard
committed
update event-data jasmine tests (mostly adding pointIndex)
1 parent 9210278 commit 261387d

File tree

6 files changed

+49
-40
lines changed

6 files changed

+49
-40
lines changed

‎test/jasmine/tests/click_test.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ describe('Test click interactions:', function() {
8686

8787
var pt = futureData.points[0];
8888
expect(Object.keys(pt)).toEqual([
89-
'data', 'fullData', 'curveNumber', 'pointNumber',
89+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
9090
'x', 'y', 'xaxis', 'yaxis'
9191
]);
9292
expect(pt.curveNumber).toEqual(0);
@@ -128,7 +128,7 @@ describe('Test click interactions:', function() {
128128

129129
var pt = futureData.points[0];
130130
expect(Object.keys(pt)).toEqual([
131-
'data', 'fullData', 'curveNumber', 'pointNumber',
131+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
132132
'x', 'y', 'xaxis', 'yaxis'
133133
]);
134134
expect(pt.curveNumber).toEqual(0);
@@ -208,7 +208,7 @@ describe('Test click interactions:', function() {
208208

209209
var pt = futureData.points[0];
210210
expect(Object.keys(pt)).toEqual([
211-
'data', 'fullData', 'curveNumber', 'pointNumber',
211+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
212212
'x', 'y', 'xaxis', 'yaxis'
213213
]);
214214
expect(pt.curveNumber).toEqual(0);
@@ -239,7 +239,7 @@ describe('Test click interactions:', function() {
239239

240240
var pt = futureData.points[0];
241241
expect(Object.keys(pt)).toEqual([
242-
'data', 'fullData', 'curveNumber', 'pointNumber',
242+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
243243
'x', 'y', 'xaxis', 'yaxis'
244244
]);
245245
expect(pt.curveNumber).toEqual(0);
@@ -274,7 +274,7 @@ describe('Test click interactions:', function() {
274274

275275
var pt = futureData.points[0];
276276
expect(Object.keys(pt)).toEqual([
277-
'data', 'fullData', 'curveNumber', 'pointNumber',
277+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
278278
'x', 'y', 'xaxis', 'yaxis'
279279
]);
280280
expect(pt.curveNumber).toEqual(0);

‎test/jasmine/tests/geo_test.js

+14-10
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ describe('Test geo interactions', function() {
569569

570570
it('should contain the correct fields', function() {
571571
expect(Object.keys(ptData)).toEqual([
572-
'data', 'fullData', 'curveNumber', 'pointNumber',
572+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
573573
'lon', 'lat', 'location', 'marker.size'
574574
]);
575575
expect(cnt).toEqual(1);
@@ -632,7 +632,7 @@ describe('Test geo interactions', function() {
632632

633633
it('should contain the correct fields', function() {
634634
expect(Object.keys(ptData)).toEqual([
635-
'data', 'fullData', 'curveNumber', 'pointNumber',
635+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
636636
'lon', 'lat', 'location', 'marker.size'
637637
]);
638638
});
@@ -664,7 +664,7 @@ describe('Test geo interactions', function() {
664664

665665
it('should contain the correct fields', function() {
666666
expect(Object.keys(ptData)).toEqual([
667-
'data', 'fullData', 'curveNumber', 'pointNumber',
667+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
668668
'lon', 'lat', 'location', 'marker.size'
669669
]);
670670
});
@@ -693,7 +693,7 @@ describe('Test geo interactions', function() {
693693

694694
it('should contain the correct fields', function() {
695695
expect(Object.keys(ptData)).toEqual([
696-
'data', 'fullData', 'curveNumber', 'pointNumber',
696+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
697697
'location', 'z'
698698
]);
699699
});
@@ -721,7 +721,7 @@ describe('Test geo interactions', function() {
721721

722722
it('should contain the correct fields', function() {
723723
expect(Object.keys(ptData)).toEqual([
724-
'data', 'fullData', 'curveNumber', 'pointNumber',
724+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
725725
'location', 'z'
726726
]);
727727
});
@@ -753,7 +753,7 @@ describe('Test geo interactions', function() {
753753

754754
it('should contain the correct fields', function() {
755755
expect(Object.keys(ptData)).toEqual([
756-
'data', 'fullData', 'curveNumber', 'pointNumber',
756+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
757757
'location', 'z'
758758
]);
759759
});
@@ -1303,7 +1303,8 @@ describe('Test event property of interactions on a geo plot:', function() {
13031303
evt = futureData.event;
13041304

13051305
expect(Object.keys(pt)).toEqual([
1306-
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat',
1306+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
1307+
'lon', 'lat',
13071308
'location', 'text', 'marker.size'
13081309
]);
13091310

@@ -1351,7 +1352,8 @@ describe('Test event property of interactions on a geo plot:', function() {
13511352
evt = futureData.event;
13521353

13531354
expect(Object.keys(pt)).toEqual([
1354-
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat',
1355+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
1356+
'lon', 'lat',
13551357
'location', 'text', 'marker.size'
13561358
]);
13571359

@@ -1392,7 +1394,8 @@ describe('Test event property of interactions on a geo plot:', function() {
13921394
evt = futureData.event;
13931395

13941396
expect(Object.keys(pt)).toEqual([
1395-
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat',
1397+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
1398+
'lon', 'lat',
13961399
'location', 'text', 'marker.size'
13971400
]);
13981401

@@ -1428,7 +1431,8 @@ describe('Test event property of interactions on a geo plot:', function() {
14281431
evt = futureData.event;
14291432

14301433
expect(Object.keys(pt)).toEqual([
1431-
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat',
1434+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
1435+
'lon', 'lat',
14321436
'location', 'text', 'marker.size'
14331437
]);
14341438

‎test/jasmine/tests/mapbox_test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,7 @@ describe('@noCI, mapbox plots', function() {
768768
return _mouseEvent('mousemove', pointPos, function() {
769769
expect(hoverData).not.toBe(undefined, 'firing on data points');
770770
expect(Object.keys(hoverData)).toEqual([
771-
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat'
771+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
772772
], 'returning the correct event data keys');
773773
expect(hoverData.curveNumber).toEqual(0, 'returning the correct curve number');
774774
expect(hoverData.pointNumber).toEqual(0, 'returning the correct point number');
@@ -778,7 +778,7 @@ describe('@noCI, mapbox plots', function() {
778778
return _mouseEvent('mousemove', blankPos, function() {
779779
expect(unhoverData).not.toBe(undefined, 'firing on data points');
780780
expect(Object.keys(unhoverData)).toEqual([
781-
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat'
781+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
782782
], 'returning the correct event data keys');
783783
expect(unhoverData.curveNumber).toEqual(0, 'returning the correct curve number');
784784
expect(unhoverData.pointNumber).toEqual(0, 'returning the correct point number');
@@ -859,7 +859,7 @@ describe('@noCI, mapbox plots', function() {
859859
return _click(pointPos, function() {
860860
expect(ptData).not.toBe(undefined, 'firing on data points');
861861
expect(Object.keys(ptData)).toEqual([
862-
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat'
862+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
863863
], 'returning the correct event data keys');
864864
expect(ptData.curveNumber).toEqual(0, 'returning the correct curve number');
865865
expect(ptData.pointNumber).toEqual(0, 'returning the correct point number');

‎test/jasmine/tests/scattermapbox_test.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ describe('@noCI Test plotly events on a scattermapbox plot:', function() {
697697
evt = futureData.event;
698698

699699
expect(Object.keys(pt)).toEqual([
700-
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat'
700+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
701701
]);
702702

703703
expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
@@ -741,7 +741,7 @@ describe('@noCI Test plotly events on a scattermapbox plot:', function() {
741741
evt = futureData.event;
742742

743743
expect(Object.keys(pt)).toEqual([
744-
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat'
744+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
745745
]);
746746

747747
expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
@@ -778,7 +778,7 @@ describe('@noCI Test plotly events on a scattermapbox plot:', function() {
778778
evt = futureData.event;
779779

780780
expect(Object.keys(pt)).toEqual([
781-
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat'
781+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
782782
]);
783783

784784
expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
@@ -810,7 +810,7 @@ describe('@noCI Test plotly events on a scattermapbox plot:', function() {
810810
evt = futureData.event;
811811

812812
expect(Object.keys(pt)).toEqual([
813-
'data', 'fullData', 'curveNumber', 'pointNumber', 'lon', 'lat'
813+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
814814
]);
815815

816816
expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');

‎test/jasmine/tests/select_test.js

+13
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,15 @@ describe('Test select box and lasso in general:', function() {
162162
assertEventData(selectedData.points, [{
163163
curveNumber: 0,
164164
pointNumber: 0,
165+
pointIndex: 0,
165166
x: 0.002,
166167
y: 16.25,
167168
id: 'id-0.002',
168169
customdata: 'customdata-16.25'
169170
}, {
170171
curveNumber: 0,
171172
pointNumber: 1,
173+
pointIndex: 1,
172174
x: 0.004,
173175
y: 12.5,
174176
id: 'id-0.004',
@@ -199,13 +201,15 @@ describe('Test select box and lasso in general:', function() {
199201
assertEventData(selectingData.points, [{
200202
curveNumber: 0,
201203
pointNumber: 0,
204+
pointIndex: 0,
202205
x: 0.002,
203206
y: 16.25,
204207
id: 'id-0.002',
205208
customdata: 'customdata-16.25'
206209
}, {
207210
curveNumber: 0,
208211
pointNumber: 1,
212+
pointIndex: 1,
209213
x: 0.004,
210214
y: 12.5,
211215
id: 'id-0.004',
@@ -225,20 +229,23 @@ describe('Test select box and lasso in general:', function() {
225229
assertEventData(selectingData.points, [{
226230
curveNumber: 0,
227231
pointNumber: 0,
232+
pointIndex: 0,
228233
x: 0.002,
229234
y: 16.25,
230235
id: 'id-0.002',
231236
customdata: 'customdata-16.25'
232237
}, {
233238
curveNumber: 0,
234239
pointNumber: 1,
240+
pointIndex: 1,
235241
x: 0.004,
236242
y: 12.5,
237243
id: 'id-0.004',
238244
customdata: 'customdata-12.5'
239245
}, {
240246
curveNumber: 0,
241247
pointNumber: 4,
248+
pointIndex: 4,
242249
x: 0.013,
243250
y: 6.875,
244251
id: 'id-0.013',
@@ -252,13 +259,15 @@ describe('Test select box and lasso in general:', function() {
252259
assertEventData(selectingData.points, [{
253260
curveNumber: 0,
254261
pointNumber: 0,
262+
pointIndex: 0,
255263
x: 0.002,
256264
y: 16.25,
257265
id: 'id-0.002',
258266
customdata: 'customdata-16.25'
259267
}, {
260268
curveNumber: 0,
261269
pointNumber: 1,
270+
pointIndex: 1,
262271
x: 0.004,
263272
y: 12.5,
264273
id: 'id-0.004',
@@ -299,6 +308,7 @@ describe('Test select box and lasso in general:', function() {
299308
assertEventData(selectingData.points, [{
300309
curveNumber: 0,
301310
pointNumber: 10,
311+
pointIndex: 10,
302312
x: 0.099,
303313
y: 2.75
304314
}], 'with the correct selecting points (1)');
@@ -307,6 +317,7 @@ describe('Test select box and lasso in general:', function() {
307317
assertEventData(selectedData.points, [{
308318
curveNumber: 0,
309319
pointNumber: 10,
320+
pointIndex: 10,
310321
x: 0.099,
311322
y: 2.75,
312323
}], 'with the correct selected points (2)');
@@ -374,6 +385,7 @@ describe('Test select box and lasso in general:', function() {
374385
assertEventData(selectingData.points, [{
375386
curveNumber: 0,
376387
pointNumber: 10,
388+
pointIndex: 10,
377389
x: 0.099,
378390
y: 2.75
379391
}], 'with the correct selecting points (1)');
@@ -382,6 +394,7 @@ describe('Test select box and lasso in general:', function() {
382394
assertEventData(selectedData.points, [{
383395
curveNumber: 0,
384396
pointNumber: 10,
397+
pointIndex: 10,
385398
x: 0.099,
386399
y: 2.75,
387400
}], 'with the correct selected points (2)');

0 commit comments

Comments
 (0)