Merges pie hover tests and fixes lint errors

Author: Ben Cutrell

src/plots/cartesian/graph_interact.js

@@ -1278,7 +1278,7 @@ function hoverChanged(gd, evt, oldhoverdata) {
 
 // remove hover effects on mouse out, and emit unhover event
 function unhover(gd, evt, subplot) {
-    if (subplot === 'pie') {
+    if(subplot === 'pie') {
         gd.emit('plotly_unhover', {
             points: [evt]
         });

src/traces/pie/plot.js

@@ -14,7 +14,6 @@ var Fx = require('../../plots/cartesian/graph_interact');
 var Color = require('../../components/color');
 var Drawing = require('../../components/drawing');
 var svgTextUtils = require('../../lib/svg_text_utils');
-var Plotly = require('../../plotly');
 
 var helpers = require('./helpers');
 
@@ -131,7 +130,7 @@ module.exports = function plot(gd, cdpie) {
                 }
 
                 function handleMouseOut(evt) {
-                    Plotly.Fx.unhover(gd, evt, 'pie');
+                    Fx.unhover(gd, evt, 'pie');
                     if(hasHoverData) {
                         Fx.loneUnhover(fullLayout._hoverlayer.node());
                         hasHoverData = false;

test/jasmine/tests/hover_pie_test.js

@@ -42,37 +42,71 @@ describe('pie hovering', function() {
              *         cyFinal: 160
              *     }];
              */
-            var futureData;
+            var hoverData,
+                unhoverData;
 
 
             gd.on('plotly_hover', function(data) {
-                futureData = data;
+                hoverData = data;
+            });
+
+            gd.on('plotly_unhover', function(data) {
+                unhoverData = data;
             });
 
             mouseEvent('mouseover', width / 2, height / 2);
-            expect(futureData.points.length).toEqual(1);
-            expect(Object.keys(futureData.points[0])).toEqual([
+            mouseEvent('mouseout', width / 2, height / 2);
+
+            expect(hoverData.points.length).toEqual(1);
+            expect(unhoverData.points.length).toEqual(1);
+
+            var fields = [
                 'v', 'label', 'color', 'i', 'hidden',
                 'text', 'px1', 'pxmid', 'midangle',
                 'px0', 'largeArc', 'cxFinal', 'cyFinal'
-            ]);
-            expect(futureData.points[0].i).toEqual(3);
+            ];
+
+            expect(Object.keys(hoverData.points[0])).toEqual(fields);
+            expect(hoverData.points[0].i).toEqual(3);
+
+            expect(Object.keys(unhoverData.points[0])).toEqual(fields);
+            expect(unhoverData.points[0].i).toEqual(3);
         });
 
-        it('should fire when moving from one slice to another', function(done) {
+        it('should fire hover event when moving from one slice to another', function(done) {
             var count = 0,
-                futureData = [];
+                hoverData = [];
 
             gd.on('plotly_hover', function(data) {
                 count++;
-                futureData.push(data);
+                hoverData.push(data);
+            });
+
+            mouseEvent('mouseover', 180, 140);
+            setTimeout(function() {
+                mouseEvent('mouseover', 240, 200);
+                expect(count).toEqual(2);
+                expect(hoverData[0]).not.toEqual(hoverData[1]);
+                done();
+            }, 100);
+        });
+
+        it('should fire unhover event when the mouse moves off the graph', function(done) {
+            var count = 0,
+                unhoverData = [];
+
+            gd.on('plotly_unhover', function(data) {
+                count++;
+                unhoverData.push(data);
             });
 
             mouseEvent('mouseover', 180, 140);
+            mouseEvent('mouseout', 180, 140);
             setTimeout(function() {
                 mouseEvent('mouseover', 240, 200);
+                mouseEvent('mouseout', 240, 200);
                 expect(count).toEqual(2);
-                expect(futureData[0]).not.toEqual(futureData[1]);
+                expect(unhoverData[0]).not.toEqual(unhoverData[1]);
                 done();
             }, 100);
         });