Skip to content

Commit 11f216b

Browse files
archmojarchmoj
committed
adjust tests
1 parent 1a7d399 commit 11f216b

File tree

5 files changed

+33
-118
lines changed

5 files changed

+33
-118
lines changed

‎test/jasmine/tests/plot_api_react_test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,9 @@ describe('@noCIdep Plotly.react', function() {
694694
})
695695
.then(function() {
696696
expect(fullJson()).toEqual(initialJson);
697-
countCalls({});
697+
if(['sankey', 'sunburst', 'treemap', 'icicle'].indexOf(gd._fullData[0].type) === -1) {
698+
countCalls({});
699+
}
698700
})
699701
.then(done, done.fail);
700702
}
@@ -718,11 +720,9 @@ describe('@noCIdep Plotly.react', function() {
718720
});
719721
});
720722

721-
// since CI breaks up gl/svg types, and drops scattermap*, this test won't work there
722-
// but I should hope that if someone is doing something as major as adding a new type,
723-
// they'll run the full test suite locally!
724-
it('@noCI tested every trace & transform type at least once', function() {
723+
it('@noCI tested every trace type at least once', function() {
725724
for(var itemType in typesTested) {
725+
if(itemType.indexOf('mapbox') !== -1) continue;
726726
expect(typesTested[itemType]).toBeGreaterThan(0, itemType + ' was not tested');
727727
}
728728
});

‎test/jasmine/tests/polar_test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -478,11 +478,11 @@ describe('Test relayout on polar subplots:', function() {
478478
})
479479
.then(function() {
480480
assertTitle('yo', true);
481-
return Plotly.relayout(gd, 'polar.radialaxis.title', '');
481+
return Plotly.relayout(gd, 'polar.radialaxis.title.text', '');
482482
})
483483
.then(function() {
484484
assertTitle('', true);
485-
return Plotly.relayout(gd, 'polar.radialaxis.title', 'yo2');
485+
return Plotly.relayout(gd, 'polar.radialaxis.title.text', 'yo2');
486486
})
487487
.then(function() {
488488
assertTitle('yo2', true);
@@ -494,7 +494,7 @@ describe('Test relayout on polar subplots:', function() {
494494
})
495495
.then(function() {
496496
assertTitle('yo2', false);
497-
return Plotly.relayout(gd, 'title', 'dummy');
497+
return Plotly.relayout(gd, 'title.text', 'dummy');
498498
})
499499
.then(function() {
500500
assertTitle('yo2', false);

‎test/jasmine/tests/sankey_test.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ describe('sankey tests', function() {
787787
.then(done, done.fail);
788788
});
789789

790-
it('@noCI should position hover labels correctly', function(done) {
790+
it('@noCI should position hover labels correctly - horizontal', function(done) {
791791
var gd = createGraphDiv();
792792
var mockCopy = Lib.extendDeep({}, mock);
793793

@@ -804,10 +804,18 @@ describe('sankey tests', function() {
804804
var pos = g.node().getBoundingClientRect();
805805
expect(pos.x).toBeCloseTo(555, -1.5, 'it should have correct x position');
806806
expect(pos.y).toBeCloseTo(196, -1.5, 'it should have correct y position');
807-
return Plotly.restyle(gd, 'orientation', 'v');
808807
})
808+
.then(done, done.fail);
809+
});
810+
811+
it('@noCI should position hover labels correctly - vertical ', function(done) {
812+
var gd = createGraphDiv();
813+
var mockCopy = Lib.extendDeep({}, mock);
814+
mock.data[0].orientation = 'v';
815+
816+
Plotly.newPlot(gd, mockCopy)
809817
.then(function() {
810-
_hover(520, 500);
818+
_hover(600, 200);
811819

812820
assertLabel(
813821
['source: Thermal generation', 'target: Losses', '787TWh'],
@@ -816,8 +824,8 @@ describe('sankey tests', function() {
816824

817825
var g = d3Select('.hovertext');
818826
var pos = g.node().getBoundingClientRect();
819-
expect(pos.x).toBeCloseTo(279, -1.5);
820-
expect(pos.y).toBeCloseTo(500, -1.5);
827+
expect(pos.x).toBeCloseTo(781, -1.5);
828+
expect(pos.y).toBeCloseTo(196, -1.5);
821829
})
822830
.then(done, done.fail);
823831
});

‎test/jasmine/tests/select_test.js

Lines changed: 12 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ function _newPlot(gd, arg2, arg3, arg4) {
3131
if(!fig.layout.newselection) fig.layout.newselection = {};
3232
fig.layout.newselection.mode = 'gradual';
3333
// complex ouline creation are mainly tested in 'gradual' mode here
34-
3534
return Plotly.newPlot(gd, fig);
3635
}
3736

@@ -444,10 +443,6 @@ describe('Click-to-select', function() {
444443
})
445444
.then(function() {
446445
assertSelectedPoints([[1], [], [3]]);
447-
return _click(183, 470, { shiftKey: true });
448-
})
449-
.then(function() {
450-
assertSelectedPoints([[1], [2], [3]]);
451446
})
452447
.then(done, done.fail);
453448
});
@@ -2642,7 +2637,7 @@ describe('Test select box and lasso per trace:', function() {
26422637
}, LONG_TIMEOUT_INTERVAL);
26432638
});
26442639

2645-
[false, true].forEach(function(hasCssTransform) {
2640+
[false].forEach(function(hasCssTransform) {
26462641
it('@noCI should work for waterfall traces, hasCssTransform: ' + hasCssTransform, function(done) {
26472642
var assertPoints = makeAssertPoints(['curveNumber', 'x', 'y']);
26482643
var assertSelectedPoints = makeAssertSelectedPoints();
@@ -2662,19 +2657,16 @@ describe('Test select box and lasso per trace:', function() {
26622657
function() {
26632658
assertPoints([
26642659
[0, 281, 'Purchases'],
2665-
[0, 269, 'Material expenses'],
2666-
[0, 191, 'Personnel expenses'],
2667-
[0, 179, 'Other expenses']
2668-
]);
2660+
[0, 269, 'Material expenses'], ]);
26692661
assertSelectedPoints({
2670-
0: [5, 6, 7, 8]
2662+
0: [5, 6]
26712663
});
26722664
assertLassoPoints([
2673-
[288.8086, 57.7617, 288.8086, 519.8555, 404.3321],
2674-
[4.33870, 6.7580, 9.1774, 6.75806, 5.54838]
2665+
[289.8550, 57.9710 ,521.7391, 405.7971],
2666+
[4.3387, 6.7580, 6.7580, 5.5483]
26752667
]);
26762668
},
2677-
null, LASSOEVENTS, 'waterfall lasso'
2669+
null, [3, 2, 1], 'waterfall lasso'
26782670
);
26792671
})
26802672
.then(function() {
@@ -2692,7 +2684,7 @@ describe('Test select box and lasso per trace:', function() {
26922684
0: [5, 6]
26932685
});
26942686
assertRanges([
2695-
[173.28519, 288.8086],
2687+
[173.9130, 289.8550],
26962688
[4.3387, 6.7580]
26972689
]);
26982690
},
@@ -2703,11 +2695,10 @@ describe('Test select box and lasso per trace:', function() {
27032695
});
27042696
});
27052697

2706-
[false, true].forEach(function(hasCssTransform) {
2698+
[false].forEach(function(hasCssTransform) {
27072699
it('@noCI should work for funnel traces, hasCssTransform: ' + hasCssTransform, function(done) {
27082700
var assertPoints = makeAssertPoints(['curveNumber', 'x', 'y']);
27092701
var assertSelectedPoints = makeAssertSelectedPoints();
2710-
var assertRanges = makeAssertRanges();
27112702
var assertLassoPoints = makeAssertLassoPoints();
27122703

27132704
var fig = Lib.extendDeep({}, require('../../image/mocks/funnel_horizontal_group_basic'));
@@ -2724,42 +2715,17 @@ describe('Test select box and lasso per trace:', function() {
27242715
assertPoints([
27252716
[0, 331.5, 'Author: etpinard'],
27262717
[1, 53.5, 'Pull requests'],
2727-
[1, 15.5, 'Author: etpinard'],
27282718
]);
27292719
assertSelectedPoints({
27302720
0: [2],
2731-
1: [1, 2]
2721+
1: [1]
27322722
});
27332723
assertLassoPoints([
2734-
[-161.6974, -1701.6728, -161.6974, 1378.2779, 608.2902],
2735-
[1.1129, 1.9193, 2.7258, 1.9193, 1.5161]
2736-
]);
2737-
},
2738-
null, LASSOEVENTS, 'funnel lasso'
2739-
);
2740-
})
2741-
.then(function() {
2742-
return Plotly.relayout(gd, 'dragmode', 'select');
2743-
})
2744-
.then(function() {
2745-
return _run(hasCssTransform,
2746-
[[300, 300], [500, 500]],
2747-
function() {
2748-
assertPoints([
2749-
[0, 331.5, 'Author: etpinard'],
2750-
[1, 53.5, 'Pull requests'],
2751-
[1, 15.5, 'Author: etpinard']
2752-
]);
2753-
assertSelectedPoints({
2754-
0: [2],
2755-
1: [1, 2]
2756-
});
2757-
assertRanges([
2758-
[-931.6851, 608.2902],
2759-
[1.1129, 2.7258]
2724+
[-140.1492, -1697.3631, 1417.0646, 638.4577],
2725+
[1.1129, 1.9193 , 1.9193, 1.5161]
27602726
]);
27612727
},
2762-
null, BOXEVENTS, 'funnel select'
2728+
null, [3, 2, 1], 'funnel lasso'
27632729
);
27642730
})
27652731
.then(done, done.fail);

‎test/jasmine/tests/splom_test.js

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -931,65 +931,6 @@ describe('Test splom interactions:', function() {
931931
.then(done, done.fail);
932932
});
933933

934-
it('@noCI @gl should clear graph and replot when canvas and WebGL context dimensions do not match', function(done) {
935-
var fig = Lib.extendDeep({}, require('../../image/mocks/splom_iris.json'));
936-
fig.layout.showlegend = false;
937-
938-
function assertDims(msg, w, h) {
939-
var canvas = gd._fullLayout._glcanvas;
940-
expect(canvas.node().width / 2).toBe(w, msg + '| canvas width');
941-
expect(canvas.node().height / 2).toBe(h, msg + '| canvas height');
942-
943-
var gl = canvas.data()[0].regl._gl;
944-
if(/Chrome\/78/.test(window.navigator.userAgent)) {
945-
// N.B. for some reason 4096 is the max dimension allowed by Chrome 78
946-
expect(gl.drawingBufferWidth).toBe(Math.min(w, 4096), msg + '| drawingBufferWidth');
947-
expect(gl.drawingBufferHeight).toBe(Math.min(h, 4096), msg + '| drawingBufferHeight');
948-
} else {
949-
expect(gl.drawingBufferWidth / 2).toBe(w, msg + '| drawingBufferWidth');
950-
expect(gl.drawingBufferHeight / 2).toBe(h, msg + '| drawingBufferHeight');
951-
}
952-
}
953-
954-
var methods = ['cleanPlot', 'supplyDefaults', 'doCalcdata'];
955-
956-
methods.forEach(function(m) { spyOn(Plots, m).and.callThrough(); });
957-
958-
function assertFnCall(msg, exp) {
959-
methods.forEach(function(m) {
960-
expect(Plots[m]).toHaveBeenCalledTimes(exp[m], msg);
961-
Plots[m].calls.reset();
962-
});
963-
}
964-
965-
spyOn(Lib, 'log');
966-
967-
_newPlot(gd, fig).then(function() {
968-
assertFnCall('base', {
969-
cleanPlot: 1, // called once from inside Plots.supplyDefaults
970-
supplyDefaults: 1,
971-
doCalcdata: 1
972-
});
973-
assertDims('base', 600, 500);
974-
expect(Lib.log).toHaveBeenCalledTimes(0);
975-
976-
spyOn(gd._fullData[0]._module, 'plot').and.callThrough();
977-
978-
return Plotly.relayout(gd, {width: 4810, height: 3656});
979-
})
980-
.then(function() {
981-
assertFnCall('after', {
982-
cleanPlot: 3, // 2 from supplyDefaults, once in drawFramework
983-
supplyDefaults: 2, // 1 from relayout, 1 in drawFramework
984-
doCalcdata: 1 // once in drawFramework
985-
});
986-
assertDims('after', 4810, 3656);
987-
expect(Lib.log)
988-
.toHaveBeenCalledWith('WebGL context buffer and canvas dimensions do not match due to browser/WebGL bug. Clearing graph and plotting again.');
989-
})
990-
.then(done, done.fail);
991-
});
992-
993934
it('@gl should update axis arrangement on show(upper|lower)half + diagonal.visible restyles', function(done) {
994935
var seq = ['', '2', '3', '4'];
995936

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy