Tests: pull click and doubleClick out into assets

select_test had a slight variant with the callback built into
doubleClick - changed it into the other form where you just do
.then(callback)

Author: alexcjohnson

test/jasmine/assets/click.js

@@ -0,0 +1,7 @@
+var mouseEvent = require('./mouse_event');
+
+module.exports = function click(x, y) {
+    mouseEvent('mousemove', x, y);
+    mouseEvent('mousedown', x, y);
+    mouseEvent('mouseup', x, y);
+};

test/jasmine/assets/double_click.js

@@ -0,0 +1,13 @@
+var click = require('./click');
+var DBLCLICKDELAY = require('@src/plots/cartesian/constants').DBLCLICKDELAY;
+
+module.exports = function doubleClick(x, y) {
+    return new Promise(function(resolve) {
+        click(x, y);
+
+        setTimeout(function() {
+            click(x, y);
+            setTimeout(function() { resolve(); }, DBLCLICKDELAY / 2);
+        }, DBLCLICKDELAY / 2);
+    });
+};

test/jasmine/tests/click_test.js

@@ -8,6 +8,12 @@ var mouseEvent = require('../assets/mouse_event');
 var getRectCenter = require('../assets/get_rect_center');
 var customMatchers = require('../assets/custom_matchers');
 
+// cartesian click events events use the hover data
+// from the mousemove events and then simulate
+// a click event on mouseup
+var click = require('../assets/click');
+var doubleClick = require('../assets/double_click');
+
 
 describe('Test click interactions:', function() {
     var mock = require('@mocks/14.json');
@@ -31,26 +37,6 @@ describe('Test click interactions:', function() {
 
     afterEach(destroyGraphDiv);
 
-    // cartesian click events events use the hover data
-    // from the mousemove events and then simulate
-    // a click event on mouseup
-    function click(x, y) {
-        mouseEvent('mousemove', x, y);
-        mouseEvent('mousedown', x, y);
-        mouseEvent('mouseup', x, y);
-    }
-
-    function doubleClick(x, y) {
-        return new Promise(function(resolve) {
-            click(x, y);
-
-            setTimeout(function() {
-                click(x, y);
-                setTimeout(function() { resolve(); }, DBLCLICKDELAY / 2);
-            }, DBLCLICKDELAY / 2);
-        });
-    }
-
     function drag(fromX, fromY, toX, toY, delay) {
         return new Promise(function(resolve) {
             mouseEvent('mousemove', fromX, fromY);

test/jasmine/tests/hover_label_test.js

@@ -8,6 +8,7 @@ var Lib = require('@src/lib');
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
 var mouseEvent = require('../assets/mouse_event');
+var doubleClick = require('../assets/double_click');
 
 describe('hover info', function() {
     'use strict';
@@ -691,26 +692,6 @@ describe('hover on fill', function() {
         }).then(done);
     });
 
-    // click and doubleClick copied over from click_test
-    // TODO require from elsewhere
-    function click(x, y) {
-        mouseEvent('mousemove', x, y);
-        mouseEvent('mousedown', x, y);
-        mouseEvent('mouseup', x, y);
-    }
-
-    function doubleClick(x, y) {
-        return new Promise(function(resolve) {
-            click(x, y);
-
-            setTimeout(function() {
-                click(x, y);
-                setTimeout(function() { resolve(); }, DBLCLICKDELAY / 2);
-            }, DBLCLICKDELAY / 2);
-        });
-    }
-    var DBLCLICKDELAY = require('@src/plots/cartesian/constants').DBLCLICKDELAY;
-
     it('should work for scatterternary too', function(done) {
         var mock = Lib.extendDeep({}, require('@mocks/ternary_fill.json'));
 

test/jasmine/tests/select_test.js

@@ -3,6 +3,8 @@ var d3 = require('d3');
 var Plotly = require('@lib/index');
 var Lib = require('@src/lib');
 var DBLCLICKDELAY = require('@src/plots/cartesian/constants').DBLCLICKDELAY;
+var click = require('../assets/click');
+var doubleClick = require('../assets/double_click');
 
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
@@ -35,23 +37,6 @@ describe('select box and lasso', function() {
         mouseEvent('mouseup', path[len - 1][0], path[len - 1][1]);
     }
 
-    // cartesian click events events use the hover data
-    // from the mousemove events and then simulate
-    // a click event on mouseup
-    function click(x, y) {
-        mouseEvent('mousemove', x, y);
-        mouseEvent('mousedown', x, y);
-        mouseEvent('mouseup', x, y);
-    }
-
-    function doubleClick(x, y, cb) {
-        click(x, y);
-        setTimeout(function() {
-            click(x, y);
-            cb();
-        }, DBLCLICKDELAY / 2);
-    }
-
     function assertRange(actual, expected) {
         var PRECISION = 4;
 
@@ -104,7 +89,7 @@ describe('select box and lasso', function() {
 
             drag([[x0, y0], [x1, y1]]);
 
-            doubleClick(x2, y2, done);
+            doubleClick(x2, y2).then(done);
         });
     });
 
@@ -153,7 +138,7 @@ describe('select box and lasso', function() {
 
             drag([[x0, y0], [x1, y1]]);
 
-            doubleClick(x2, y2, done);
+            doubleClick(x2, y2).then(done);
         });
     });
 
@@ -225,7 +210,7 @@ describe('select box and lasso', function() {
                 y: [0.10209191961595454, 24.512223978291406]
             }, 'with the correct selected range');
 
-            doubleClick(250, 200, function() {
+            doubleClick(250, 200).then(function() {
                 expect(doubleClickData).toBe(null, 'with the correct deselect data');
                 done();
             });
@@ -283,7 +268,7 @@ describe('select box and lasso', function() {
                 y: 2.75
             }], 'with the correct selected points');
 
-            doubleClick(250, 200, function() {
+            doubleClick(250, 200).then(function() {
                 expect(doubleClickData).toBe(null, 'with the correct deselect data');
                 done();
             });

test/jasmine/tests/ternary_test.js

@@ -1,13 +1,14 @@
 var Plotly = require('@lib');
 var Lib = require('@src/lib');
-var DBLCLICKDELAY = require('@src/plots/cartesian/constants').DBLCLICKDELAY;
 
 var supplyLayoutDefaults = require('@src/plots/ternary/layout/defaults');
 
 var d3 = require('d3');
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
 var mouseEvent = require('../assets/mouse_event');
+var click = require('../assets/click');
+var doubleClick = require('../assets/double_click');
 var customMatchers = require('../assets/custom_matchers');
 
 
@@ -238,23 +239,6 @@ describe('ternary plots', function() {
         return d3.select('.hoverlayer').selectAll('g');
     }
 
-    function click(x, y) {
-        mouseEvent('mousemove', x, y);
-        mouseEvent('mousedown', x, y);
-        mouseEvent('mouseup', x, y);
-    }
-
-    function doubleClick(x, y) {
-        return new Promise(function(resolve) {
-            click(x, y);
-
-            setTimeout(function() {
-                click(x, y);
-                resolve();
-            }, DBLCLICKDELAY / 2);
-        });
-    }
-
     function drag(path) {
         var len = path.length;