Skip to content

Commit ee74b28

Browse files
etpinardetpinard
committed
adapt test suites that require assets/drag.js
1 parent 8806fb7 commit ee74b28

10 files changed

+47
-51
lines changed

‎test/jasmine/tests/annotations_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ describe('annotation effects', function() {
10501050
afterEach(destroyGraphDiv);
10511051

10521052
function dragAndReplot(node, dx, dy, edge) {
1053-
return drag(node, dx, dy, edge).then(function() {
1053+
return drag({node: node, dpos: [dx, dy], edge: edge}).then(function() {
10541054
return Plots.previousPromises(gd);
10551055
});
10561056
}

‎test/jasmine/tests/cartesian_interact_test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ describe('axis zoom/pan and main plot zoom', function() {
329329
function doDrag(subplot, directions, dx, dy, nsteps) {
330330
return function() {
331331
var dragger = getDragger(subplot, directions);
332-
return drag(dragger, dx, dy, undefined, undefined, undefined, nsteps);
332+
return drag({node: dragger, dpos: [dx, dy], nsteps: nsteps});
333333
};
334334
}
335335

@@ -359,7 +359,7 @@ describe('axis zoom/pan and main plot zoom', function() {
359359

360360
function makeDragFns(subplot, directions, dx, dy, x0, y0) {
361361
var dragger = getDragger(subplot, directions);
362-
return drag.makeFns(dragger, dx, dy, {x0: x0, y0: y0});
362+
return drag.makeFns({node: dragger, dpos: [dx, dy], pos0: [x0, y0]});
363363
}
364364

365365
describe('subplots with shared axes', function() {

‎test/jasmine/tests/colorbar_test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ describe('Test colorbar:', function() {
406406
expect(gd.data[0].colorbar).toBeUndefined();
407407
expect(gd._fullData[0].colorbar.x).toBe(1.02);
408408
expect(gd._fullData[0].colorbar.y).toBe(0.5);
409-
return drag(getCBNode(), -100, 100);
409+
return drag({node: getCBNode(), dpos: [-100, 100]});
410410
})
411411
.then(function() {
412412
expect(gd.data[0].colorbar.x).toBeWithin(0.591, 0.01);
@@ -426,7 +426,7 @@ describe('Test colorbar:', function() {
426426
expect(gd.data[0].marker.colorbar).toBeUndefined();
427427
expect(gd._fullData[0].marker.colorbar.x).toBe(1.02);
428428
expect(gd._fullData[0].marker.colorbar.y).toBe(0.5);
429-
return drag(getCBNode(), -100, 100);
429+
return drag({node: getCBNode(), dpos: [-100, 100]});
430430
})
431431
.then(function() {
432432
expect(gd.data[0].marker.colorbar.x).toBeWithin(0.591, 0.01);
@@ -446,7 +446,7 @@ describe('Test colorbar:', function() {
446446
expect(gd.layout.coloraxis.colorbar).toBeUndefined();
447447
expect(gd._fullLayout.coloraxis.colorbar.x).toBe(1.02);
448448
expect(gd._fullLayout.coloraxis.colorbar.y).toBe(0.5);
449-
return drag(getCBNode(), -100, 100);
449+
return drag({node: getCBNode(), dpos: [-100, 100]});
450450
})
451451
.then(function() {
452452
expect(gd.layout.coloraxis.colorbar.x).toBeWithin(0.591, 0.01);

‎test/jasmine/tests/gl2d_plot_interact_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ describe('Test gl2d plot interactions:', function() {
403403
var node = d3.select('.nsewdrag[data-subplot="xy"]').node();
404404
var dx = p1[0] - p0[0];
405405
var dy = p1[1] - p0[1];
406-
return drag(node, dx, dy, null, p0[0], p0[1]);
406+
return drag({node: node, dpos: [dx, dy], pos0: p0});
407407
}
408408

409409
it('@gl should respond to drag interactions', function(done) {

‎test/jasmine/tests/plot_api_react_test.js

+5-8
Original file line numberDiff line numberDiff line change
@@ -1504,8 +1504,7 @@ describe('Plotly.react and uirevision attributes', function() {
15041504
function editSelection() {
15051505
// drag across the upper right quadrant, so we'll select
15061506
// curve 0 point 1 and curve 1 point 2
1507-
return drag(document.querySelector('.nsewdrag'),
1508-
148, 100, '', 150, 102);
1507+
return drag({node: document.querySelector('.nsewdrag'), dpos: [148, 100], pos0: [150, 102]});
15091508
}
15101509

15111510
var checkNoSelection = checkState([
@@ -1547,8 +1546,7 @@ describe('Plotly.react and uirevision attributes', function() {
15471546
function editSelection() {
15481547
// drag across the upper right quadrant, so we'll select
15491548
// curve 0 point 1 and curve 1 point 2
1550-
return drag(document.querySelector('.nsewdrag'),
1551-
148, 148, '', 150, 102);
1549+
return drag({node: document.querySelector('.nsewdrag'), dpos: [148, 148], pos0: [150, 102]});
15521550
}
15531551

15541552
var checkNoSelection = checkState([{selectedpoints: undefined}]);
@@ -1800,19 +1798,18 @@ describe('Plotly.react and uirevision attributes', function() {
18001798
}
18011799

18021800
function editTrace() {
1803-
var _;
18041801
return Registry.call('_guiRestyle', gd,
18051802
{'line.colorbar.title.text': 'color', name: 'name'},
18061803
[0]
18071804
)
18081805
.then(function() {
1809-
return drag(axisDragNode(0), 0, 50, _, _, _, _, true);
1806+
return drag({node: axisDragNode(0), dpos: [0, 50], noCover: true});
18101807
})
18111808
.then(function() {
1812-
return drag(axisDragNode(0), 0, -50, _, _, _, _, true);
1809+
return drag({node: axisDragNode(0), dpos: [0, -50], noCover: true});
18131810
})
18141811
.then(function() {
1815-
return drag(axisDragNode(1), 0, -50, _, _, _, _, true);
1812+
return drag({node: axisDragNode(1), dpos: [0, -50], noCover: true});
18161813
});
18171814
}
18181815

‎test/jasmine/tests/polar_test.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ describe('Test polar interactions:', function() {
874874

875875
function _drag(p0, dp) {
876876
var node = d3.select('.polar > .draglayer > .maindrag').node();
877-
return drag(node, dp[0], dp[1], null, p0[0], p0[1]);
877+
return drag({node: node, dpos: dp, pos0: p0});
878878
}
879879

880880
function _assertRange(rng, msg) {
@@ -984,7 +984,7 @@ describe('Test polar interactions:', function() {
984984
// to activate the radial drag mode
985985
function _drag(p0, dp) {
986986
var node = d3.select('.polar > .draglayer > .radialdrag').node();
987-
return drag(node, dp[0], dp[1], null, p0[0], p0[1], 2);
987+
return drag({node: node, dpos: dp, pos0: p0, nsteps: 2});
988988
}
989989

990990
function _assert(rng, angle, evtRng1, evtAngle, msg) {
@@ -1066,7 +1066,7 @@ describe('Test polar interactions:', function() {
10661066
// to activate the radial drag mode
10671067
function _drag(p0, dp) {
10681068
var node = d3.select('.polar > .draglayer > .radialdrag-inner').node();
1069-
return drag(node, dp[0], dp[1], null, p0[0], p0[1], 2);
1069+
return drag({node: node, dpos: dp, pos0: p0, nsteps: 2});
10701070
}
10711071

10721072
function _assert(rng, msg) {
@@ -1105,7 +1105,7 @@ describe('Test polar interactions:', function() {
11051105

11061106
function _drag(p0, dp) {
11071107
var node = d3.select('.polar > .draglayer > .angulardrag').node();
1108-
return drag(node, dp[0], dp[1], null, p0[0], p0[1]);
1108+
return drag({node: node, dpos: dp, pos0: p0});
11091109
}
11101110

11111111
function _assert(rot, msg, noEvent) {
@@ -1161,14 +1161,14 @@ describe('Test polar interactions:', function() {
11611161
var node = d3.select('.polar > .draglayer > .radialdrag').node();
11621162
var p0 = [375, 200];
11631163
var dp = [-50, 0];
1164-
return drag(node, dp[0], dp[1], null, p0[0], p0[1], 2);
1164+
return drag({node: node, dpos: dp, pos0: p0, nsteps: 2});
11651165
}
11661166

11671167
function _dragAngular() {
11681168
var node = d3.select('.polar > .draglayer > .angulardrag').node();
11691169
var p0 = [350, 150];
11701170
var dp = [-20, 20];
1171-
return drag(node, dp[0], dp[1], null, p0[0], p0[1]);
1171+
return drag({node: node, dpos: dp, pos0: p0});
11721172
}
11731173

11741174
// once on drag, once on mouseup relayout
@@ -1266,7 +1266,7 @@ describe('Test polar interactions:', function() {
12661266

12671267
function _drag(p0, dp, nsteps) {
12681268
var node = d3.select('.polar > .draglayer > .radialdrag').node();
1269-
return drag(node, dp[0], dp[1], null, p0[0], p0[1], nsteps);
1269+
return drag({node: node, dpos: dp, pos0: p0, nsteps: nsteps});
12701270
}
12711271

12721272
var gd = createGraphDiv();
@@ -1300,7 +1300,7 @@ describe('Test polar interactions:', function() {
13001300

13011301
function _drag(p0, dp, nsteps) {
13021302
var node = d3.select('.polar > .draglayer > .maindrag').node();
1303-
return drag(node, dp[0], dp[1], null, p0[0], p0[1], nsteps);
1303+
return drag({node: node, dpos: dp, pos0: p0, nsteps: nsteps});
13041304
}
13051305

13061306
var gd = createGraphDiv();
@@ -1332,7 +1332,7 @@ describe('Test polar interactions:', function() {
13321332

13331333
function _drag(p0, dp, nsteps) {
13341334
var node = d3.select('.polar > .draglayer > .angulardrag').node();
1335-
return drag(node, dp[0], dp[1], null, p0[0], p0[1], nsteps);
1335+
return drag({node: node, dpos: dp, pos0: p0, nsteps: nsteps});
13361336
}
13371337

13381338
var dragPos0 = [360, 180];
@@ -1381,7 +1381,7 @@ describe('Test polar *gridshape linear* interactions', function() {
13811381
// to activate the radial drag mode
13821382
function _drag(p0, dp) {
13831383
var node = d3.select('.polar > .draglayer > .radialdrag').node();
1384-
return drag(node, dp[0], dp[1], null, p0[0], p0[1], 2);
1384+
return drag({node: node, dpos: dp, pos0: p0, nsteps: 2});
13851385
}
13861386

13871387
function _assert(msg, angle) {
@@ -1441,7 +1441,7 @@ describe('Test polar *gridshape linear* interactions', function() {
14411441

14421442
function _run(msg, p0, dp, exp) {
14431443
var node = d3.select('.polar > .draglayer > .angulardrag').node();
1444-
var dragFns = drag.makeFns(node, dp[0], dp[1], {x0: p0[0], y0: p0[1]});
1444+
var dragFns = drag.makeFns({node: node, dpos: dp, pos0: p0});
14451445

14461446
return dragFns.start().then(function() {
14471447
layersRotateFromZero.forEach(function(q) {
@@ -1517,7 +1517,7 @@ describe('Test polar *gridshape linear* interactions', function() {
15171517

15181518
function _run(msg, p0, dp, exp) {
15191519
var node = d3.select('.polar > .draglayer > .maindrag').node();
1520-
var dragFns = drag.makeFns(node, dp[0], dp[1], {x0: p0[0], y0: p0[1]});
1520+
var dragFns = drag.makeFns({node: node, dpos: dp, pos0: p0});
15211521

15221522
return dragFns.start().then(function() {
15231523
var zl = d3.select(gd).select('g.zoomlayer');

‎test/jasmine/tests/sankey_test.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,7 @@ describe('sankey tests', function() {
12681268
node = nodes.item(nodeId);
12691269
position = getNodeCoords(node);
12701270
var timeDelay = (arrangement === 'snap') ? 2000 : 0; // Wait for force simulation to finish
1271-
return drag(node, move[0], move[1], false, false, false, 10, false, timeDelay);
1271+
return drag({node: node, dpos: move, nsteps: 10, timeDelay: timeDelay});
12721272
})
12731273
.then(function() {
12741274
nodes = document.getElementsByClassName('sankey-node');
@@ -1319,7 +1319,7 @@ describe('sankey tests', function() {
13191319

13201320
nodes = document.getElementsByClassName('sankey-node');
13211321
node = nodes.item(nodeId);
1322-
return drag(node, move[0], move[1]);
1322+
return drag({node: node, dpos: move});
13231323
})
13241324
.then(function() {
13251325
x = gd._fullData[0].node.x.slice();
@@ -1329,7 +1329,7 @@ describe('sankey tests', function() {
13291329

13301330
nodes = document.getElementsByClassName('sankey-node');
13311331
node = nodes.item(nodes.length - 1); // Dragged node is now the last one
1332-
return drag(node, move[0], move[1]);
1332+
return drag({node: node, dpos: move});
13331333
})
13341334
.then(function() {
13351335
x1 = gd._fullData[0].node.x.slice();
@@ -1384,7 +1384,7 @@ describe('sankey tests', function() {
13841384
positionBeforeDrag = getNodeCoords(node);
13851385
positionBeforeDrag = [positionBeforeDrag.x, positionBeforeDrag.y];
13861386
positionAfterDrag = [positionBeforeDrag[0] + move[0], positionBeforeDrag[1] + move[1]];
1387-
return drag(node, move[0], move[1], false, false, false, 10, false, 1000);
1387+
return drag({node: node, dpos: move, nsteps: 10, timeDelay: 1000});
13881388
})
13891389
.then(function() {
13901390
// Check that the node was really moved

‎test/jasmine/tests/shapes_test.js

+14-14
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ describe('A fixed size path shape', function() {
834834
it('is draggable', function(done) {
835835
Plotly.plot(gd, data, layout, {editable: true})
836836
.then(function() {
837-
drag(getFirstShapeNode(), 50, 50).then(function() {
837+
drag({node: getFirstShapeNode(), dpos: [50, 50]}).then(function() {
838838
assertShapeSize(getFirstShapeNode(), 30, 20);
839839
done();
840840
});
@@ -852,7 +852,7 @@ describe('A fixed size path shape', function() {
852852
var shapeNodeBeforeDrag = getFirstShapeNode();
853853
var widthBeforeDrag = shapeNodeBeforeDrag.getBoundingClientRect().width;
854854

855-
drag(shapeNodeBeforeDrag, 300, 50).then(function() {
855+
drag({node: shapeNodeBeforeDrag, dpos: [300, 50]}).then(function() {
856856
var shapeNodeAfterDrag = getFirstShapeNode();
857857
var bbox = shapeNodeAfterDrag.getBoundingClientRect();
858858
expect(bbox.height).toBe(20);
@@ -874,7 +874,7 @@ describe('A fixed size path shape', function() {
874874
var shapeNodeBeforeDrag = getFirstShapeNode();
875875
var heightBeforeDrag = shapeNodeBeforeDrag.getBoundingClientRect().height;
876876

877-
drag(shapeNodeBeforeDrag, 50, 300).then(function() {
877+
drag({node: shapeNodeBeforeDrag, dpos: [50, 300]}).then(function() {
878878
var shapeNodeAfterDrag = getFirstShapeNode();
879879
var bbox = shapeNodeAfterDrag.getBoundingClientRect();
880880
expect(bbox.width).toBe(30);
@@ -1006,7 +1006,7 @@ describe('A fixed size shape', function() {
10061006
it('is draggable', function(done) {
10071007
Plotly.plot(gd, data, layout, {editable: true})
10081008
.then(function() {
1009-
drag(getFirstShapeNode(), 50, 50).then(function() {
1009+
drag({node: getFirstShapeNode(), dpos: [50, 50]}).then(function() {
10101010
assertShapeSize(getFirstShapeNode(), 25, 25);
10111011
done();
10121012
});
@@ -1025,7 +1025,7 @@ describe('A fixed size shape', function() {
10251025
var shapeNodeBeforeDrag = getFirstShapeNode();
10261026
var widthBeforeDrag = shapeNodeBeforeDrag.getBoundingClientRect().width;
10271027

1028-
drag(shapeNodeBeforeDrag, 300, 50).then(function() {
1028+
drag({node: shapeNodeBeforeDrag, dpos: [300, 50]}).then(function() {
10291029
var shapeNodeAfterDrag = getFirstShapeNode();
10301030
var bbox = shapeNodeAfterDrag.getBoundingClientRect();
10311031
expect(bbox.height).toBe(25);
@@ -1048,7 +1048,7 @@ describe('A fixed size shape', function() {
10481048
var shapeNodeBeforeDrag = getFirstShapeNode();
10491049
var heightBeforeDrag = shapeNodeBeforeDrag.getBoundingClientRect().height;
10501050

1051-
drag(shapeNodeBeforeDrag, 50, 300).then(function() {
1051+
drag({node: shapeNodeBeforeDrag, dpos: [50, 300]}).then(function() {
10521052
var shapeNodeAfterDrag = getFirstShapeNode();
10531053
var bbox = shapeNodeAfterDrag.getBoundingClientRect();
10541054
expect(bbox.width).toBe(25);
@@ -1088,7 +1088,7 @@ describe('A fixed size shape', function() {
10881088
var dx = shallShrink ? dxToShrinkWidth[direction] : dxToEnlargeWidth[direction];
10891089
var dy = shallShrink ? dyToShrinkHeight[direction] : dyToEnlargeHeight[direction];
10901090

1091-
drag(shapeNodeBeforeDrag, dx, dy, direction)
1091+
drag({node: shapeNodeBeforeDrag, dpos: [dx, dy], edge: direction})
10921092
.then(function() {
10931093
var shapeNodeAfterDrag = getFirstShapeNode();
10941094
var bBoxAfterDrag = shapeNodeAfterDrag.getBoundingClientRect();
@@ -1117,7 +1117,7 @@ describe('A fixed size shape', function() {
11171117
var bBoxBeforeDrag = shapeNodeBeforeDrag.getBoundingClientRect();
11181118

11191119
var dragSensitiveElement = getMoveLineDragElement(0);
1120-
drag(dragSensitiveElement, 10, -10)
1120+
drag({node: dragSensitiveElement, dpos: [10, -10]})
11211121
.then(function() {
11221122
var shapeNodeAfterDrag = getFirstShapeNode();
11231123
var bBoxAfterDrag = shapeNodeAfterDrag.getBoundingClientRect();
@@ -1138,7 +1138,7 @@ describe('A fixed size shape', function() {
11381138
var bBoxBeforeDrag = shapeNodeBeforeDrag.getBoundingClientRect();
11391139

11401140
var dragSensitiveElement = getResizeLineOverStartPointElement();
1141-
drag(dragSensitiveElement, 50, -10)
1141+
drag({node: dragSensitiveElement, dpos: [50, -10]})
11421142
.then(function() {
11431143
var shapeNodeAfterDrag = getFirstShapeNode();
11441144
var bBoxAfterDrag = shapeNodeAfterDrag.getBoundingClientRect();
@@ -1161,7 +1161,7 @@ describe('A fixed size shape', function() {
11611161
var bBoxBeforeDrag = shapeNodeBeforeDrag.getBoundingClientRect();
11621162

11631163
var dragSensitiveElement = getResizeLineOverEndPointElement();
1164-
drag(dragSensitiveElement, 50, -10)
1164+
drag({node: dragSensitiveElement, dpos: [50, -10]})
11651165
.then(function() {
11661166
var shapeNodeAfterDrag = getFirstShapeNode();
11671167
var bBoxAfterDrag = shapeNodeAfterDrag.getBoundingClientRect();
@@ -1464,7 +1464,7 @@ describe('Test shapes', function() {
14641464

14651465
var initialCoordinates = getShapeCoordinates(layoutShape, x2p, y2p);
14661466

1467-
return drag(node, dx, dy).then(function() {
1467+
return drag({node: node, dpos: [dx, dy]}).then(function() {
14681468
var finalCoordinates = getShapeCoordinates(layoutShape, x2p, y2p);
14691469

14701470
expect(finalCoordinates.x0 - initialCoordinates.x0).toBeCloseTo(dx);
@@ -1494,7 +1494,7 @@ describe('Test shapes', function() {
14941494

14951495
expect(initialCoordinates.length).toBe(6);
14961496

1497-
return drag(node, dx, dy).then(function() {
1497+
return drag({node: node, dpos: [dx, dy]}).then(function() {
14981498
var finalPath = layoutShape.path;
14991499
var finalCoordinates = getPathCoordinates(finalPath, x2p, y2p);
15001500

@@ -1523,7 +1523,7 @@ describe('Test shapes', function() {
15231523

15241524
var initialCoordinates = getShapeCoordinates(layoutShape, x2p, y2p);
15251525

1526-
return drag(node, dx, dy, direction).then(function() {
1526+
return drag({node: node, dpos: [dx, dy], edge: direction}).then(function() {
15271527
var finalCoordinates = getShapeCoordinates(layoutShape, x2p, y2p);
15281528

15291529
var keyN, keyS, keyW, keyE;
@@ -1572,7 +1572,7 @@ describe('Test shapes', function() {
15721572
getResizeLineOverEndPointElement();
15731573

15741574
var initialCoordinates = getShapeCoordinates(layoutShape, x2p, y2p);
1575-
return drag(dragHandle, 10, 10).then(function() {
1575+
return drag({node: dragHandle, dpos: [10, 10]}).then(function() {
15761576
var finalCoordinates = getShapeCoordinates(layoutShape, x2p, y2p);
15771577

15781578
if(pointToMove === 'start') {

‎test/jasmine/tests/splom_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1501,7 +1501,7 @@ describe('Test splom drag:', function() {
15011501
var node = d3.select('.nsewdrag[data-subplot="xy"]').node();
15021502
var dx = p1[0] - p0[0];
15031503
var dy = p1[1] - p0[1];
1504-
return drag(node, dx, dy, null, p0[0], p0[1]);
1504+
return drag({node: node, dpos: [dx, dy], pos0: p0});
15051505
}
15061506

15071507
it('@gl should update scattermatrix ranges on pan', function(done) {

0 commit comments

Comments
 (0)