Skip to content

Commit 9a57ec3

Browse files
archmojarchmoj
committed
adjust jasmine tests
1 parent 034779d commit 9a57ec3

File tree

7 files changed

+97
-115
lines changed

7 files changed

+97
-115
lines changed

‎test/jasmine/tests/click_test.js

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,11 @@ describe('Test click interactions:', function() {
115115
expect(contextPassthroughs).toBe(0);
116116

117117
var pt = futureData.points[0];
118-
expect(Object.keys(pt)).toEqual([
118+
expect(Object.keys(pt).sort()).toEqual([
119119
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
120+
'bbox', 'x0', 'x1', 'y0', 'y1',
120121
'x', 'y', 'xaxis', 'yaxis'
121-
]);
122+
].sort());
122123
expect(pt.curveNumber).toEqual(0);
123124
expect(pt.pointNumber).toEqual(11);
124125
expect(pt.x).toEqual(0.125);
@@ -148,10 +149,11 @@ describe('Test click interactions:', function() {
148149
expect(contextPassthroughs).toBe(0);
149150

150151
var pt = futureData.points[0];
151-
expect(Object.keys(pt)).toEqual([
152+
expect(Object.keys(pt).sort()).toEqual([
152153
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
154+
'bbox', 'x0', 'x1', 'y0', 'y1',
153155
'x', 'y', 'xaxis', 'yaxis'
154-
]);
156+
].sort());
155157
expect(pt.curveNumber).toEqual(0);
156158
expect(pt.pointNumber).toEqual(11);
157159
expect(pt.x).toEqual(0.125);
@@ -219,10 +221,11 @@ describe('Test click interactions:', function() {
219221
expect(contextPassthroughs).toBe(0, i);
220222

221223
var pt = futureData.points[0];
222-
expect(Object.keys(pt)).toEqual([
224+
expect(Object.keys(pt).sort()).toEqual([
223225
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
226+
'bbox', 'x0', 'x1', 'y0', 'y1',
224227
'x', 'y', 'xaxis', 'yaxis'
225-
]);
228+
].sort());
226229
expect(pt.curveNumber).toEqual(0);
227230
expect(pt.pointNumber).toEqual(11);
228231
expect(pt.x).toEqual(0.125);
@@ -308,10 +311,11 @@ describe('Test click interactions:', function() {
308311
expect(futureData.points.length).toEqual(1);
309312

310313
var pt = futureData.points[0];
311-
expect(Object.keys(pt)).toEqual([
314+
expect(Object.keys(pt).sort()).toEqual([
312315
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
316+
'bbox', 'x0', 'x1', 'y0', 'y1',
313317
'x', 'y', 'xaxis', 'yaxis'
314-
]);
318+
].sort());
315319
expect(pt.curveNumber).toEqual(0);
316320
expect(pt.pointNumber).toEqual(11);
317321
expect(pt.x).toEqual(0.125);
@@ -341,10 +345,11 @@ describe('Test click interactions:', function() {
341345
expect(futureData.points.length).toEqual(1);
342346

343347
var pt = futureData.points[0];
344-
expect(Object.keys(pt)).toEqual([
348+
expect(Object.keys(pt).sort()).toEqual([
345349
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
350+
'bbox', 'x0', 'x1', 'y0', 'y1',
346351
'x', 'y', 'xaxis', 'yaxis'
347-
]);
352+
].sort());
348353
expect(pt.curveNumber).toEqual(0);
349354
expect(pt.pointNumber).toEqual(11);
350355
expect(pt.x).toEqual(0.125);
@@ -378,10 +383,11 @@ describe('Test click interactions:', function() {
378383
expect(futureData.points.length).toEqual(1);
379384

380385
var pt = futureData.points[0];
381-
expect(Object.keys(pt)).toEqual([
386+
expect(Object.keys(pt).sort()).toEqual([
382387
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
388+
'bbox', 'x0', 'x1', 'y0', 'y1',
383389
'x', 'y', 'xaxis', 'yaxis'
384-
]);
390+
].sort());
385391
expect(pt.curveNumber).toEqual(0);
386392
expect(pt.pointNumber).toEqual(11);
387393
expect(pt.x).toEqual(0.125);

‎test/jasmine/tests/funnelarea_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ describe('funnelarea hovering', function() {
763763

764764
var fields = [
765765
'curveNumber', 'pointNumber', 'pointNumbers',
766-
'data', 'fullData',
766+
'data', 'fullData', 'bbox',
767767
'label', 'color', 'value',
768768
'percent', 'text'
769769
];

‎test/jasmine/tests/geo_test.js

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -882,10 +882,10 @@ describe('Test geo interactions', function() {
882882
});
883883

884884
it('should contain the correct fields', function() {
885-
expect(Object.keys(ptData)).toEqual([
886-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
885+
expect(Object.keys(ptData).sort().sort()).toEqual([
886+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'bbox',
887887
'lon', 'lat', 'location', 'marker.size'
888-
]);
888+
].sort());
889889
expect(cnt).toEqual(1);
890890
});
891891

@@ -947,10 +947,10 @@ describe('Test geo interactions', function() {
947947
});
948948

949949
it('should contain the correct fields', function() {
950-
expect(Object.keys(ptData)).toEqual([
951-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
950+
expect(Object.keys(ptData).sort()).toEqual([
951+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'bbox',
952952
'lon', 'lat', 'location', 'marker.size'
953-
]);
953+
].sort());
954954
});
955955

956956
it('should show the correct point data', function() {
@@ -979,10 +979,10 @@ describe('Test geo interactions', function() {
979979
});
980980

981981
it('should contain the correct fields', function() {
982-
expect(Object.keys(ptData)).toEqual([
983-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
982+
expect(Object.keys(ptData).sort()).toEqual([
983+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'bbox',
984984
'lon', 'lat', 'location', 'marker.size'
985-
]);
985+
].sort());
986986
});
987987

988988
it('should show the correct point data', function() {
@@ -1008,10 +1008,10 @@ describe('Test geo interactions', function() {
10081008
});
10091009

10101010
it('should contain the correct fields', function() {
1011-
expect(Object.keys(ptData)).toEqual([
1012-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
1011+
expect(Object.keys(ptData).sort()).toEqual([
1012+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'bbox',
10131013
'location', 'z', 'ct'
1014-
]);
1014+
].sort());
10151015
});
10161016

10171017
it('should show the correct point data', function() {
@@ -1036,10 +1036,10 @@ describe('Test geo interactions', function() {
10361036
});
10371037

10381038
it('should contain the correct fields', function() {
1039-
expect(Object.keys(ptData)).toEqual([
1040-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
1039+
expect(Object.keys(ptData).sort()).toEqual([
1040+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'bbox',
10411041
'location', 'z', 'ct'
1042-
]);
1042+
].sort());
10431043
});
10441044

10451045
it('should show the correct point data', function() {
@@ -1068,10 +1068,10 @@ describe('Test geo interactions', function() {
10681068
});
10691069

10701070
it('should contain the correct fields', function() {
1071-
expect(Object.keys(ptData)).toEqual([
1072-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
1071+
expect(Object.keys(ptData).sort()).toEqual([
1072+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'bbox',
10731073
'location', 'z', 'ct'
1074-
]);
1074+
].sort());
10751075
});
10761076

10771077
it('should show the correct point data', function() {
@@ -1789,11 +1789,11 @@ describe('Test event property of interactions on a geo plot:', function() {
17891789
var pt = futureData.points[0];
17901790
var evt = futureData.event;
17911791

1792-
expect(Object.keys(pt)).toEqual([
1793-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
1792+
expect(Object.keys(pt).sort()).toEqual([
1793+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'bbox',
17941794
'lon', 'lat',
17951795
'location', 'text', 'marker.size'
1796-
]);
1796+
].sort());
17971797

17981798
expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
17991799
expect(typeof pt.data).toEqual(typeof {}, 'points[0].data');
@@ -1847,11 +1847,11 @@ describe('Test event property of interactions on a geo plot:', function() {
18471847
// var pt = futureData.points[0],
18481848
// evt = futureData.event;
18491849

1850-
// expect(Object.keys(pt)).toEqual([
1851-
// 'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
1850+
// expect(Object.keys(pt).sort()).toEqual([
1851+
// 'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'bbox',
18521852
// 'lon', 'lat',
18531853
// 'location', 'text', 'marker.size'
1854-
// ]);
1854+
// ].sort());
18551855

18561856
// expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
18571857
// expect(typeof pt.data).toEqual(typeof {}, 'points[0].data');
@@ -1893,11 +1893,11 @@ describe('Test event property of interactions on a geo plot:', function() {
18931893
var pt = futureData.points[0];
18941894
var evt = futureData.event;
18951895

1896-
expect(Object.keys(pt)).toEqual([
1897-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
1896+
expect(Object.keys(pt).sort()).toEqual([
1897+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'bbox',
18981898
'lon', 'lat',
18991899
'location', 'text', 'marker.size'
1900-
]);
1900+
].sort());
19011901

19021902
expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
19031903
expect(typeof pt.data).toEqual(typeof {}, 'points[0].data');
@@ -1934,11 +1934,11 @@ describe('Test event property of interactions on a geo plot:', function() {
19341934
var pt = futureData.points[0];
19351935
var evt = futureData.event;
19361936

1937-
expect(Object.keys(pt)).toEqual([
1938-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
1937+
expect(Object.keys(pt).sort()).toEqual([
1938+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'bbox',
19391939
'lon', 'lat',
19401940
'location', 'text', 'marker.size'
1941-
]);
1941+
].sort());
19421942

19431943
expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
19441944
expect(typeof pt.data).toEqual(typeof {}, 'points[0].data');

‎test/jasmine/tests/mapbox_test.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ var customAssertions = require('../assets/custom_assertions');
1919
var assertHoverLabelStyle = customAssertions.assertHoverLabelStyle;
2020
var assertHoverLabelContent = customAssertions.assertHoverLabelContent;
2121

22+
var SORTED_EVENT_KEYS = [
23+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex',
24+
'lon', 'lat',
25+
'bbox'
26+
].sort();
27+
2228
var MAPBOX_ACCESS_TOKEN = require('@build/credentials.json').MAPBOX_ACCESS_TOKEN;
2329
var TRANSITION_DELAY = 500;
2430
var MOUSE_DELAY = 100;
@@ -1243,19 +1249,15 @@ describe('mapbox plots', function() {
12431249
.then(function() {
12441250
return _mouseEvent('mousemove', pointPos, function() {
12451251
expect(hoverData).not.toBe(undefined, 'firing on data points');
1246-
expect(Object.keys(hoverData)).toEqual([
1247-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
1248-
], 'returning the correct event data keys');
1252+
expect(Object.keys(hoverData).sort()).toEqual(SORTED_EVENT_KEYS, 'returning the correct event data keys');
12491253
expect(hoverData.curveNumber).toEqual(0, 'returning the correct curve number');
12501254
expect(hoverData.pointNumber).toEqual(0, 'returning the correct point number');
12511255
});
12521256
})
12531257
.then(function() {
12541258
return _mouseEvent('mousemove', blankPos, function() {
12551259
expect(unhoverData).not.toBe(undefined, 'firing on data points');
1256-
expect(Object.keys(unhoverData)).toEqual([
1257-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
1258-
], 'returning the correct event data keys');
1260+
expect(Object.keys(unhoverData).sort()).toEqual(SORTED_EVENT_KEYS, 'returning the correct event data keys');
12591261
expect(unhoverData.curveNumber).toEqual(0, 'returning the correct curve number');
12601262
expect(unhoverData.pointNumber).toEqual(0, 'returning the correct point number');
12611263
});
@@ -1400,9 +1402,7 @@ describe('mapbox plots', function() {
14001402
.then(function() { return click(pointPos[0], pointPos[1]); })
14011403
.then(function() {
14021404
expect(ptData).not.toBe(undefined, 'firing on data points');
1403-
expect(Object.keys(ptData)).toEqual([
1404-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
1405-
], 'returning the correct event data keys');
1405+
expect(Object.keys(ptData).sort()).toEqual(SORTED_EVENT_KEYS, 'returning the correct event data keys');
14061406
expect(ptData.curveNumber).toEqual(0, 'returning the correct curve number');
14071407
expect(ptData.pointNumber).toEqual(0, 'returning the correct point number');
14081408
})

‎test/jasmine/tests/pie_test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,9 +1101,9 @@ describe('pie hovering', function() {
11011101

11021102
var fields = [
11031103
'curveNumber', 'pointNumber', 'pointNumbers',
1104-
'data', 'fullData',
1104+
'data', 'fullData', 'bbox',
11051105
'label', 'color', 'value',
1106-
'i', 'v', 'percent', 'text'
1106+
'i', 'v', 'percent', 'text',
11071107
];
11081108

11091109
expect(Object.keys(hoverData.points[0]).sort()).toEqual(fields.sort());

‎test/jasmine/tests/scattermapbox_test.js

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -952,9 +952,9 @@ describe('Test plotly events on a scattermapbox plot:', function() {
952952

953953
var pt = futureData.points[0];
954954

955-
expect(Object.keys(pt)).toEqual([
956-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
957-
]);
955+
expect(Object.keys(pt).sort()).toEqual([
956+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat', 'bbox'
957+
].sort());
958958

959959
expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
960960
expect(typeof pt.data).toEqual(typeof {}, 'points[0].data');
@@ -999,9 +999,9 @@ describe('Test plotly events on a scattermapbox plot:', function() {
999999
// var pt = futureData.points[0],
10001000
// evt = futureData.event;
10011001

1002-
// expect(Object.keys(pt)).toEqual([
1003-
// 'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
1004-
// ]);
1002+
// expect(Object.keys(pt).sort()).toEqual([
1003+
// 'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat', 'bbox'
1004+
// ].sort());
10051005

10061006
// expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
10071007
// expect(typeof pt.data).toEqual(typeof {}, 'points[0].data');
@@ -1033,9 +1033,9 @@ describe('Test plotly events on a scattermapbox plot:', function() {
10331033

10341034
var pt = futureData.points[0];
10351035

1036-
expect(Object.keys(pt)).toEqual([
1037-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
1038-
]);
1036+
expect(Object.keys(pt).sort()).toEqual([
1037+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat', 'bbox'
1038+
].sort());
10391039

10401040
expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
10411041
expect(typeof pt.data).toEqual(typeof {}, 'points[0].data');
@@ -1061,9 +1061,9 @@ describe('Test plotly events on a scattermapbox plot:', function() {
10611061
move(pointPos[0], pointPos[1], nearPos[0], nearPos[1], HOVERMINTIME + 10).then(function() {
10621062
var pt = futureData.points[0];
10631063

1064-
expect(Object.keys(pt)).toEqual([
1065-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
1066-
]);
1064+
expect(Object.keys(pt).sort()).toEqual([
1065+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat', 'bbox'
1066+
].sort());
10671067

10681068
expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
10691069
expect(typeof pt.data).toEqual(typeof {}, 'points[0].data');
@@ -1133,9 +1133,9 @@ describe('Test plotly events on a scattermapbox plot when css transform is prese
11331133

11341134
var pt = futureData.points[0];
11351135

1136-
expect(Object.keys(pt)).toEqual([
1137-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
1138-
]);
1136+
expect(Object.keys(pt).sort()).toEqual([
1137+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat', 'bbox'
1138+
].sort());
11391139

11401140
expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
11411141
expect(typeof pt.data).toEqual(typeof {}, 'points[0].data');
@@ -1163,9 +1163,9 @@ describe('Test plotly events on a scattermapbox plot when css transform is prese
11631163

11641164
var pt = futureData.points[0];
11651165

1166-
expect(Object.keys(pt)).toEqual([
1167-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
1168-
]);
1166+
expect(Object.keys(pt).sort()).toEqual([
1167+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat', 'bbox'
1168+
].sort());
11691169

11701170
expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
11711171
expect(typeof pt.data).toEqual(typeof {}, 'points[0].data');
@@ -1191,9 +1191,9 @@ describe('Test plotly events on a scattermapbox plot when css transform is prese
11911191
move(pointPos[0], pointPos[1], nearPos[0], nearPos[1], HOVERMINTIME + 10).then(function() {
11921192
var pt = futureData.points[0];
11931193

1194-
expect(Object.keys(pt)).toEqual([
1195-
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat'
1196-
]);
1194+
expect(Object.keys(pt).sort()).toEqual([
1195+
'data', 'fullData', 'curveNumber', 'pointNumber', 'pointIndex', 'lon', 'lat', 'bbox'
1196+
].sort());
11971197

11981198
expect(pt.curveNumber).toEqual(0, 'points[0].curveNumber');
11991199
expect(typeof pt.data).toEqual(typeof {}, 'points[0].data');

0 commit comments

Comments
 (0)