Merge branch 'texttemplate-split' into texttemplate

Author: antoinerg

test/image/baselines/gl2d_texttemplate.png

@@ -0,0 +1,52 @@
+{
+  "data": [{
+      "type": "scattergl",
+      "mode": "markers+text",
+      "x": [0, 1, 2, 3],
+      "y": [0, 1, 4, 9],
+
+      "text": ["a", "b", "c", "d"],
+      "texttemplate": "%{text}: (%{x}, %{y})",
+      "textposition": "top center",
+      "xaxis": "x2",
+      "yaxis": "y2"
+    }, {
+      "type": "scatterpolargl",
+      "mode": "markers+text",
+      "text": ["A", "B", "C", "D"],
+      "texttemplate": "%{text}: (%{r:0.2f},%{theta:0.2f})",
+      "textposition": "top center",
+      "r": [1, 0.5, 1, 1.5],
+      "theta": [0, 90, 180, 270],
+      "showgrid": false,
+      "subplot": "polar"
+  }
+  ],
+  "layout": {
+    "showlegend": false,
+    "width": 600,
+    "height": 300,
+    "margin": {
+      "t": 50,
+      "b": 50,
+      "l": 50,
+      "r": 50
+    },
+    "polar": {
+      "radialaxis": {
+        "showline": false,
+        "linewidth": 0,
+        "tickwidth": 2,
+        "gridcolor": "white",
+        "gridwidth": 0
+      }
+    },
+    "grid": {
+      "rows": 1,
+      "columns": 2,
+      "pattern": "independent",
+      "xgap": 5,
+      "ygap": 5
+    }
+  }
+}

test/image/baselines/gl3d_scatter3d-texttemplate.png

@@ -0,0 +1,16 @@
+{
+  "data": [{
+      "type": "scatter3d",
+      "x": [0, 1, 2],
+      "y": [0, 2, 1],
+      "z": [-5, -2, 4],
+      "text": ["A", "B", "C"],
+      "texttemplate": "%{text}: (%{x}, %{y}, %{z})",
+      "mode": "markers+text"
+    }],
+  "layout": {
+      "width": 400,
+      "height": 400,
+      "margin": {"t": 20, "l": 0, "r": 0, "b": 0}
+  }
+}

test/image/mocks/gl2d_texttemplate.json

@@ -31,14 +31,14 @@ module.exports = function checkTextTemplate(mock, selector, tests) {
     mock[0].customdata = customdata;
     tests.push(['%{customdata}', customdata]);
 
-    tests.forEach(function(test) {
-        it(isGL ? '@gl' : '' + 'should support texttemplate', function(done) {
-            var gd = createGraphDiv();
-            var mockCopy = Lib.extendDeep(mock, {});
-            mockCopy[0].texttemplate = test[0];
-            Plotly.newPlot(gd, mockCopy)
-                .then(function() {
-                    if(isGL) {
+    if(isGL) {
+        tests.forEach(function(test) {
+            it('@gl should support texttemplate', function(done) {
+                var gd = createGraphDiv();
+                var mockCopy = Lib.extendDeep(mock, {});
+                mockCopy[0].texttemplate = test[0];
+                Plotly.newPlot(gd, mockCopy)
+                    .then(function() {
                         var glText;
                         if(isPolar) {
                             glText = gd._fullLayout.polar._subplot._scene.glText;
@@ -54,20 +54,36 @@ module.exports = function checkTextTemplate(mock, selector, tests) {
                             var text = glText[0].text.slice(from, to);
                             expect(text).toEqual(test[1][i]);
                         }
-                    } else {
+                    })
+                    .catch(failTest)
+                    .finally(function() {
+                        Plotly.purge(gd);
+                        destroyGraphDiv();
+                    })
+                    .then(done);
+            });
+        });
+    } else {
+        tests.forEach(function(test) {
+            it('should support texttemplate', function(done) {
+                var gd = createGraphDiv();
+                var mockCopy = Lib.extendDeep(mock, {});
+                mockCopy[0].texttemplate = test[0];
+                Plotly.newPlot(gd, mockCopy)
+                    .then(function() {
                         var pts = Plotly.d3.selectAll(selector);
                         expect(pts.size()).toBe(test[1].length);
                         pts.each(function() {
                             expect(test[1]).toContain(Plotly.d3.select(this).text());
                         });
-                    }
-                })
-                .catch(failTest)
-                .finally(function() {
-                    Plotly.purge(gd);
-                    destroyGraphDiv();
-                })
-                .then(done);
+                    })
+                    .catch(failTest)
+                    .finally(function() {
+                        Plotly.purge(gd);
+                        destroyGraphDiv();
+                    })
+                    .then(done);
+            });
         });
-    });
+    }
 };