categorical 2dmap: fix flaky tests

Author: antoinerg

src/traces/heatmap/clean_2d_array.js

@@ -20,7 +20,7 @@ module.exports = function clean2dArray(zOld, trace, xa, ya) {
         return +v;
     }
 
-    if(trace.transpose) {
+    if(trace && trace.transpose) {
         rowlen = 0;
         for(i = 0; i < zOld.length; i++) rowlen = Math.max(rowlen, zOld[i].length);
         if(rowlen === 0) return false;

test/jasmine/tests/contour_test.js

@@ -358,9 +358,10 @@ describe('contour calc', function() {
     ['contour'].forEach(function(traceType) {
         it('should sort z data based on axis categoryorder for ' + traceType, function() {
             var mock = require('@mocks/heatmap_categoryorder');
-            var data = mock.data[0];
+            var mockCopy = Lib.extendDeep({}, mock);
+            var data = mockCopy.data[0];
             data.type = traceType;
-            var layout = mock.layout;
+            var layout = mockCopy.layout;
 
             // sort x axis categories
             var mockLayout = Lib.extendDeep({}, layout);
@@ -387,9 +388,10 @@ describe('contour calc', function() {
 
         it('should sort z data based on axis categoryarray ' + traceType, function() {
             var mock = require('@mocks/heatmap_categoryorder');
-            var data = mock.data[0];
+            var mockCopy = Lib.extendDeep({}, mock);
+            var data = mockCopy.data[0];
             data.type = traceType;
-            var layout = mock.layout;
+            var layout = mockCopy.layout;
 
             layout.xaxis.categoryorder = 'array';
             layout.xaxis.categoryarray = ['x', 'z', 'y', 'w'];

test/jasmine/tests/histogram2d_test.js

@@ -172,7 +172,7 @@ describe('Test histogram2d', function() {
         });
 
         ['histogram2d', 'histogram2dcontour'].forEach(function(traceType) {
-            it('@flaky should sort z data based on axis categoryorder for ' + traceType, function() {
+            it('should sort z data based on axis categoryorder for ' + traceType, function() {
                 var mock = require('@mocks/heatmap_categoryorder');
                 var mockCopy = Lib.extendDeep({}, mock);
                 var data = mockCopy.data[0];