X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Fmultiple_axes-old.js;h=de6100f7bfb119049faf3b0a7401f7aa3ffc9e90;hb=bfb3e0a44ba7eb76704389cd1515db9995944d41;hp=0f2959ef1b495430606d42fe1e7c8a7419e4a9dd;hpb=7249a5aa13b2861eb6e79ca39059233fc6ed701d;p=dygraphs.git diff --git a/auto_tests/tests/multiple_axes-old.js b/auto_tests/tests/multiple_axes-old.js index 0f2959e..de6100f 100644 --- a/auto_tests/tests/multiple_axes-old.js +++ b/auto_tests/tests/multiple_axes-old.js @@ -50,8 +50,8 @@ MultipleAxesOldTestCase.prototype.testOldBasicMultipleAxes = function() { } ); - assertEquals(["0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"], Util.getYLabels("1")); - assertEquals(["900K", "1.01M", "1.12M", "1.23M", "1.34M", "1.45M", "1.55M", "1.66M", "1.77M", "1.88M", "1.99M"], Util.getYLabels("2")); + assertEquals(["0","20","40","60","80","100"], Util.getYLabels("1")); + assertEquals(["900K","1.12M","1.34M","1.55M","1.77M","1.99M"], Util.getYLabels("2")); }; MultipleAxesOldTestCase.prototype.testOldNewStylePerAxisOptions = function() { @@ -78,8 +78,8 @@ MultipleAxesOldTestCase.prototype.testOldNewStylePerAxisOptions = function() { } ); - assertEquals(["0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"], Util.getYLabels("1")); - assertEquals(["900K", "1.01M", "1.12M", "1.23M", "1.34M", "1.45M", "1.55M", "1.66M", "1.77M", "1.88M", "1.99M"], Util.getYLabels("2")); + assertEquals(["0","20","40","60","80","100"], Util.getYLabels("1")); + assertEquals(["900K","1.12M","1.34M","1.55M","1.77M","1.99M"], Util.getYLabels("2")); }; MultipleAxesOldTestCase.prototype.testOldMultiAxisLayout = function() { @@ -236,7 +236,8 @@ MultipleAxesOldTestCase.prototype.testOldValueRangePerAxisOptions = function() { }, axes: { y: { - valueRange: [40, 70] + valueRange: [40, 70], + axisLabelWidth: 60 }, y2: { // set axis-related properties here @@ -245,7 +246,6 @@ MultipleAxesOldTestCase.prototype.testOldValueRangePerAxisOptions = function() { }, ylabel: 'Primary y-axis', y2label: 'Secondary y-axis', - yAxisLabelWidth: 60 } ); assertEquals(["40", "45", "50", "55", "60", "65"], Util.getYLabels("1")); @@ -278,7 +278,7 @@ MultipleAxesOldTestCase.prototype.testOldDrawPointCallback = function() { }; var secondCallback = function(g, seriesName, ctx, canvasx, canvasy, color, radius) { results.y2[seriesName] = 1; - Dygraph.Circles.TRIANGLE(g, seriesName, ctx, canvasx, canvasy, color, radius); + Dygraph.Circles.DEFAULT(g, seriesName, ctx, canvasx, canvasy, color, radius); }; g = new Dygraph(