modified condition tests

Author: archmoj

src/traces/surface/defaults.js

@@ -28,14 +28,13 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 
     var z = coerce('z');
     if(!z || !z.length ||
-       (x ? (x.length < 2) : false) ||
-       (y ? (y.length < 2) : false)
+       (x ? (x.length < 1) : false) ||
+       (y ? (y.length < 1) : false)
     ) {
         traceOut.visible = false;
         return;
     }
 
-
     traceOut._xlength = (Array.isArray(x) && Lib.isArrayOrTypedArray(x[0])) ? z.length : z[0].length;
     traceOut._ylength = z.length;
 

test/jasmine/tests/surface_test.js

@@ -185,29 +185,40 @@ describe('Test surface', function() {
 
     });
 
-
     describe('Test dimension and expected visibility tests', function() {
         var gd;
 
         beforeEach(function() {
             gd = createGraphDiv();
         });
 
-
         afterEach(function() {
             Plotly.purge(gd);
             destroyGraphDiv();
         });
 
-
         function assertVisibility(exp, msg) {
             expect(gd._fullData[0]).not.toBe(undefined, 'no visibility!');
             expect(gd._fullData[0].visible).toBe(exp, msg);
         }
 
-        fit('@gl surface should be invisible when the z array is empty', function(done) {
+        it('@gl surface should be invisible when the z array is empty', function(done) {
+            Plotly.plot(gd, [{
+                'type': 'surface',
+                'z': []
+            }])
+            .then(function() {
+                assertVisibility(false, 'not to be visible');
+            })
+            .catch(failTest)
+            .then(done);
+        });
+
+        it('@gl surface should be invisible when the x array is defined but is empty', function(done) {
             Plotly.plot(gd, [{
                 'type': 'surface',
+                'x': [],
+                'y': [0, 1],
                 'z': []
             }])
             .then(function() {
@@ -217,35 +228,49 @@ describe('Test surface', function() {
             .then(done);
         });
 
-        fit('@gl surface should be invisible when the x array is defined but has less than two rows', function(done) {
+        it('@gl surface should be invisible when the y array is defined but is empty', function(done) {
+            Plotly.plot(gd, [{
+                'type': 'surface',
+                'x': [0, 1],
+                'y': [],
+                'z': []
+            }])
+            .then(function() {
+                assertVisibility(false, 'not to be visible');
+            })
+            .catch(failTest)
+            .then(done);
+        });
+
+        it('@gl surface should be invisible when the x array is defined and has at least one item', function(done) {
             Plotly.plot(gd, [{
                 'type': 'surface',
                 'x': [0],
                 'y': [0, 1],
                 'z': [[1], [2]]
             }])
             .then(function() {
-                assertVisibility(false, 'not to be visible');
+                assertVisibility(true, 'to be visible');
             })
             .catch(failTest)
             .then(done);
         });
 
-        fit('@gl surface should be invisible when the y array is defined but has less than two colums', function(done) {
+        it('@gl surface should be invisible when the y array is defined and has at least one item', function(done) {
             Plotly.plot(gd, [{
                 'type': 'surface',
                 'x': [0, 1],
                 'y': [0],
                 'z': [[1, 2]]
             }])
             .then(function() {
-                assertVisibility(false, 'not to be visible');
+                assertVisibility(true, 'to be visible');
             })
             .catch(failTest)
             .then(done);
         });
 
-        fit('@gl surface should be visible when the x and y are not provided; but z array is provided', function(done) {
+        it('@gl surface should be visible when the x and y are not provided; but z array is provided', function(done) {
             Plotly.plot(gd, [{
                 'type': 'surface',
                 'z': [[1, 2], [3, 4]]
@@ -257,7 +282,7 @@ describe('Test surface', function() {
             .then(done);
         });
 
-        fit('@gl surface should be invisible when the x and y are provided; but z array is not provided', function(done) {
+        it('@gl surface should be invisible when the x and y are provided; but z array is not provided', function(done) {
             Plotly.plot(gd, [{
                 'type': 'surface',
                 'x': [0, 1],