Merge branch 'CSG/MultiAxis-StackedGraph' into CSG-v1.0.1

[dygraphs.git] / auto_tests / tests / axis_labels.js

diff --git a/auto_tests/tests/axis_labels.js b/auto_tests/tests/axis_labels.js
index 048722d..54c0207 100644 (file)
--- a/auto_tests/tests/axis_labels.js
+++ b/auto_tests/tests/axis_labels.js
@@ -206,7 +206,7 @@ AxisLabelsTestCase.prototype.testDateAxisLabelFormatter = function () {
           assertEquals('number', typeof(granularity));
           assertEquals('function', typeof(opts));
           assertEquals('[Dygraph graph]', dg.toString());
-          return 'x' + x.strftime('%Y/%m/%d');
+          return 'x' + Util.formatDate(x);
         }
       },
       y : {
@@ -228,7 +228,7 @@ AxisLabelsTestCase.prototype.testDateAxisLabelFormatter = function () {
   var graph = document.getElementById("graph");
   var g = new Dygraph(graph, data, opts);
 
-  assertEquals(["x2011/01/01", "x2011/01/02", "x2011/01/03", "x2011/01/04", "x2011/01/05", "x2011/01/06", "x2011/01/07", "x2011/01/08", "x2011/01/09"], Util.getXLabels());
+  assertEquals(["x2011/01/01", "x2011/01/02", "x2011/01/03", "x2011/01/04", "x2011/01/05", "x2011/01/06", "x2011/01/07", "x2011/01/08"], Util.getXLabels());
   assertEquals(['y2','y4','y6','y8','y10','y12','y14','y16','y18'], Util.getYLabels());
 
   g.setSelection(0);
@@ -292,7 +292,7 @@ AxisLabelsTestCase.prototype.testDateValueFormatter = function () {
           assertEquals('function', typeof(opts));
           assertEquals('string', typeof(series_name));
           assertEquals('[Dygraph graph]', dg.toString());
-          return 'x' + new Date(x).strftime('%Y/%m/%d');
+          return 'x' + Util.formatDate(x);
         }
       },
       y : {
@@ -316,7 +316,7 @@ AxisLabelsTestCase.prototype.testDateValueFormatter = function () {
   var g = new Dygraph(graph, data, opts);
 
   // valueFormatters do not affect ticks.
-  assertEquals(['01Jan','02Jan','03Jan','04Jan','05Jan','06Jan','07Jan','08Jan','09Jan'], Util.getXLabels());
+  assertEquals(['01Jan','02Jan','03Jan','04Jan','05Jan','06Jan','07Jan','08Jan'], Util.getXLabels());
   assertEquals(['2','4','6','8','10','12','14','16','18'], Util.getYLabels());
 
   // the valueFormatter options also affect the legend.
@@ -741,7 +741,7 @@ AxisLabelsTestCase.prototype.testLabelsKMBPerAxis = function() {
           x: { labelsKMB: true }
         },
         series: {
-          b: { axis: "y2" },
+          b: { axis: "y2" }
         }
       });
 
@@ -769,7 +769,7 @@ AxisLabelsTestCase.prototype.testLabelsKMBG2IPerAxis = function() {
           x: { labelsKMG2: true }
         },
         series: {
-          b: { axis: "y2" },
+          b: { axis: "y2" }
         }
       });
 
@@ -799,7 +799,7 @@ AxisLabelsTestCase.prototype.testSigFigsPerAxis = function() {
           x: { sigFigs: 8 }
         },
         series: {
-          b: { axis: "y2" },
+          b: { axis: "y2" }
         }
 
       });
@@ -823,7 +823,7 @@ AxisLabelsTestCase.prototype.testDigitsAfterDecimalPerAxis = function() {
       "0.009,0.004,0.005\n", {
         digitsAfterDecimal: 1,
         series: {
-          b: { axis: "y2" },
+          b: { axis: "y2" }
         }
 
       });
@@ -872,10 +872,10 @@ AxisLabelsTestCase.prototype.testMaxNumberWidthPerAxis = function() {
       "12404,12604,12801\n", {
         maxNumberWidth: 1,
         series: {
-          b: { axis: "y2" },
+          b: { axis: "y2" }
         }
       });
-fail = function(x) {console.log(x)};
+
   g.updateOptions({ axes: { y: { maxNumberWidth: 4 }}});
   assertEquals(["1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4"] , Util.getYLabels(1));
   g.updateOptions({ axes: { y: { maxNumberWidth: 5 }}});