Skip to content

Commit

Permalink
adapt test suites that require assets/drag.js
Browse files Browse the repository at this point in the history
  • Loading branch information
@etpinard
etpinard committed Jun 11, 2019
1 parent 8806fb7 commit ee74b28
Show file tree
Hide file tree
Showing 10 changed files with 47 additions and 51 deletions.
2 changes: 1 addition & 1 deletion test/jasmine/tests/annotations_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,7 @@ describe('annotation effects', function() {
afterEach(destroyGraphDiv);

function dragAndReplot(node, dx, dy, edge) {
return drag(node, dx, dy, edge).then(function() {
return drag({node: node, dpos: [dx, dy], edge: edge}).then(function() {
return Plots.previousPromises(gd);
});
}
Expand Down
4 changes: 2 additions & 2 deletions test/jasmine/tests/cartesian_interact_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ describe('axis zoom/pan and main plot zoom', function() {
function doDrag(subplot, directions, dx, dy, nsteps) {
return function() {
var dragger = getDragger(subplot, directions);
return drag(dragger, dx, dy, undefined, undefined, undefined, nsteps);
return drag({node: dragger, dpos: [dx, dy], nsteps: nsteps});
};
}

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

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

describe('subplots with shared axes', function() {
Expand Down
6 changes: 3 additions & 3 deletions test/jasmine/tests/colorbar_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ describe('Test colorbar:', function() {
expect(gd.data[0].colorbar).toBeUndefined();
expect(gd._fullData[0].colorbar.x).toBe(1.02);
expect(gd._fullData[0].colorbar.y).toBe(0.5);
return drag(getCBNode(), -100, 100);
return drag({node: getCBNode(), dpos: [-100, 100]});
})
.then(function() {
expect(gd.data[0].colorbar.x).toBeWithin(0.591, 0.01);
Expand All @@ -426,7 +426,7 @@ describe('Test colorbar:', function() {
expect(gd.data[0].marker.colorbar).toBeUndefined();
expect(gd._fullData[0].marker.colorbar.x).toBe(1.02);
expect(gd._fullData[0].marker.colorbar.y).toBe(0.5);
return drag(getCBNode(), -100, 100);
return drag({node: getCBNode(), dpos: [-100, 100]});
})
.then(function() {
expect(gd.data[0].marker.colorbar.x).toBeWithin(0.591, 0.01);
Expand All @@ -446,7 +446,7 @@ describe('Test colorbar:', function() {
expect(gd.layout.coloraxis.colorbar).toBeUndefined();
expect(gd._fullLayout.coloraxis.colorbar.x).toBe(1.02);
expect(gd._fullLayout.coloraxis.colorbar.y).toBe(0.5);
return drag(getCBNode(), -100, 100);
return drag({node: getCBNode(), dpos: [-100, 100]});
})
.then(function() {
expect(gd.layout.coloraxis.colorbar.x).toBeWithin(0.591, 0.01);
Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/tests/gl2d_plot_interact_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ describe('Test gl2d plot interactions:', function() {
var node = d3.select('.nsewdrag[data-subplot="xy"]').node();
var dx = p1[0] - p0[0];
var dy = p1[1] - p0[1];
return drag(node, dx, dy, null, p0[0], p0[1]);
return drag({node: node, dpos: [dx, dy], pos0: p0});
}

it('@gl should respond to drag interactions', function(done) {
Expand Down
13 changes: 5 additions & 8 deletions test/jasmine/tests/plot_api_react_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1504,8 +1504,7 @@ describe('Plotly.react and uirevision attributes', function() {
function editSelection() {
// drag across the upper right quadrant, so we'll select
// curve 0 point 1 and curve 1 point 2
return drag(document.querySelector('.nsewdrag'),
148, 100, '', 150, 102);
return drag({node: document.querySelector('.nsewdrag'), dpos: [148, 100], pos0: [150, 102]});
}

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

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

function editTrace() {
var _;
return Registry.call('_guiRestyle', gd,
{'line.colorbar.title.text': 'color', name: 'name'},
[0]
)
.then(function() {
return drag(axisDragNode(0), 0, 50, _, _, _, _, true);
return drag({node: axisDragNode(0), dpos: [0, 50], noCover: true});
})
.then(function() {
return drag(axisDragNode(0), 0, -50, _, _, _, _, true);
return drag({node: axisDragNode(0), dpos: [0, -50], noCover: true});
})
.then(function() {
return drag(axisDragNode(1), 0, -50, _, _, _, _, true);
return drag({node: axisDragNode(1), dpos: [0, -50], noCover: true});
});
}

Expand Down
24 changes: 12 additions & 12 deletions test/jasmine/tests/polar_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ describe('Test polar interactions:', function() {

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

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

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

function _assert(rng, msg) {
Expand Down Expand Up @@ -1105,7 +1105,7 @@ describe('Test polar interactions:', function() {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

return dragFns.start().then(function() {
var zl = d3.select(gd).select('g.zoomlayer');
Expand Down
8 changes: 4 additions & 4 deletions test/jasmine/tests/sankey_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@ describe('sankey tests', function() {
node = nodes.item(nodeId);
position = getNodeCoords(node);
var timeDelay = (arrangement === 'snap') ? 2000 : 0; // Wait for force simulation to finish
return drag(node, move[0], move[1], false, false, false, 10, false, timeDelay);
return drag({node: node, dpos: move, nsteps: 10, timeDelay: timeDelay});
})
.then(function() {
nodes = document.getElementsByClassName('sankey-node');
Expand Down Expand Up @@ -1319,7 +1319,7 @@ describe('sankey tests', function() {

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

nodes = document.getElementsByClassName('sankey-node');
node = nodes.item(nodes.length - 1); // Dragged node is now the last one
return drag(node, move[0], move[1]);
return drag({node: node, dpos: move});
})
.then(function() {
x1 = gd._fullData[0].node.x.slice();
Expand Down Expand Up @@ -1384,7 +1384,7 @@ describe('sankey tests', function() {
positionBeforeDrag = getNodeCoords(node);
positionBeforeDrag = [positionBeforeDrag.x, positionBeforeDrag.y];
positionAfterDrag = [positionBeforeDrag[0] + move[0], positionBeforeDrag[1] + move[1]];
return drag(node, move[0], move[1], false, false, false, 10, false, 1000);
return drag({node: node, dpos: move, nsteps: 10, timeDelay: 1000});
})
.then(function() {
// Check that the node was really moved
Expand Down
28 changes: 14 additions & 14 deletions test/jasmine/tests/shapes_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ describe('A fixed size path shape', function() {
it('is draggable', function(done) {
Plotly.plot(gd, data, layout, {editable: true})
.then(function() {
drag(getFirstShapeNode(), 50, 50).then(function() {
drag({node: getFirstShapeNode(), dpos: [50, 50]}).then(function() {
assertShapeSize(getFirstShapeNode(), 30, 20);
done();
});
Expand All @@ -852,7 +852,7 @@ describe('A fixed size path shape', function() {
var shapeNodeBeforeDrag = getFirstShapeNode();
var widthBeforeDrag = shapeNodeBeforeDrag.getBoundingClientRect().width;

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

drag(shapeNodeBeforeDrag, 50, 300).then(function() {
drag({node: shapeNodeBeforeDrag, dpos: [50, 300]}).then(function() {
var shapeNodeAfterDrag = getFirstShapeNode();
var bbox = shapeNodeAfterDrag.getBoundingClientRect();
expect(bbox.width).toBe(30);
Expand Down Expand Up @@ -1006,7 +1006,7 @@ describe('A fixed size shape', function() {
it('is draggable', function(done) {
Plotly.plot(gd, data, layout, {editable: true})
.then(function() {
drag(getFirstShapeNode(), 50, 50).then(function() {
drag({node: getFirstShapeNode(), dpos: [50, 50]}).then(function() {
assertShapeSize(getFirstShapeNode(), 25, 25);
done();
});
Expand All @@ -1025,7 +1025,7 @@ describe('A fixed size shape', function() {
var shapeNodeBeforeDrag = getFirstShapeNode();
var widthBeforeDrag = shapeNodeBeforeDrag.getBoundingClientRect().width;

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

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

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

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

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

var dragSensitiveElement = getResizeLineOverEndPointElement();
drag(dragSensitiveElement, 50, -10)
drag({node: dragSensitiveElement, dpos: [50, -10]})
.then(function() {
var shapeNodeAfterDrag = getFirstShapeNode();
var bBoxAfterDrag = shapeNodeAfterDrag.getBoundingClientRect();
Expand Down Expand Up @@ -1464,7 +1464,7 @@ describe('Test shapes', function() {

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

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

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

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

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

Expand Down Expand Up @@ -1523,7 +1523,7 @@ describe('Test shapes', function() {

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

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

var keyN, keyS, keyW, keyE;
Expand Down Expand Up @@ -1572,7 +1572,7 @@ describe('Test shapes', function() {
getResizeLineOverEndPointElement();

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

if(pointToMove === 'start') {
Expand Down
2 changes: 1 addition & 1 deletion test/jasmine/tests/splom_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1501,7 +1501,7 @@ describe('Test splom drag:', function() {
var node = d3.select('.nsewdrag[data-subplot="xy"]').node();
var dx = p1[0] - p0[0];
var dy = p1[1] - p0[1];
return drag(node, dx, dy, null, p0[0], p0[1]);
return drag({node: node, dpos: [dx, dy], pos0: p0});
}

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

0 comments on commit ee74b28

Please sign in to comment.