clean up fx helpers from funnel info - cleanup custom_assertions from isEmpty hack

Author: archmoj

src/components/fx/helpers.js

@@ -149,9 +149,6 @@ exports.makeEventData = function makeEventData(pt, trace, cd) {
         if(pt.xa) out.xaxis = pt.xa;
         if(pt.ya) out.yaxis = pt.ya;
         if(pt.zLabelVal !== undefined) out.z = pt.zLabelVal;
-        if(pt.percentInitial !== undefined) out.z = pt.percentInitial;
-        if(pt.percentPrevious !== undefined) out.z = pt.percentPrevious;
-        if(pt.percentTotal !== undefined) out.z = pt.percentTotal;
     }
 
     exports.appendArrayPointValue(out, trace, pointNumber);

test/jasmine/assets/custom_assertions.js

@@ -98,7 +98,6 @@ function count(selector) {
  *  - vOrder {array of number}
  *  - hOrder {array of number}
  *  - isRotated {boolean}
- *  - isEmpty {boolean}
  * @param {string} msg
  */
 exports.assertHoverLabelContent = function(expectation, msg) {
@@ -193,15 +192,11 @@ exports.assertHoverLabelContent = function(expectation, msg) {
             }
         });
     } else {
-        if(expectation.isEmpty) {
-            return true;
-        } else {
-            if(expectation.nums) {
-                fail(ptMsg + ': expecting *nums* labels, did not find any.');
-            }
-            if(expectation.name) {
-                fail(ptMsg + ': expecting *nums* labels, did not find any.');
-            }
+        if(expectation.nums) {
+            fail(ptMsg + ': expecting *nums* labels, did not find any.');
+        }
+        if(expectation.name) {
+            fail(ptMsg + ': expecting *nums* labels, did not find any.');
         }
     }
 

test/jasmine/tests/funnel_test.js

@@ -1348,9 +1348,7 @@ describe('funnel hover', function() {
             Plotly.plot(gd, mock)
             .then(_hover)
             .then(function() {
-                assertHoverLabelContent({
-                    isEmpty: true
-                });
+                expect(d3.selectAll('g.hovertext').size()).toBe(0);
             })
             .catch(failTest)
             .then(done);