X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Fper_series.js;h=b1b672e945f82e9e87d4e58a2aa387a75104231f;hb=54f4c379dcad2be2e6b2922b9e25e46352ee604d;hp=8a7e081f66d55670a38d6a889ff15398fcf65d98;hpb=c17e11738cb5603fafcdc84527114502312344c4;p=dygraphs.git

diff --git a/auto_tests/tests/per_series.js b/auto_tests/tests/per_series.js
index 8a7e081..b1b672e 100644
--- a/auto_tests/tests/per_series.js
+++ b/auto_tests/tests/per_series.js
@@ -16,10 +16,16 @@ perSeriesTestCase.prototype.testPerSeriesFill = function() {
   var opts = {
     width: 480,
     height: 320,
-    drawXGrid: false,
-    drawYGrid: false,
-    drawXAxis: false,
-    drawYAxis: false,
+    axes : {
+      x : {
+        drawGrid: false,
+        drawAxis: false,
+      },
+      y : {
+        drawGrid: false,
+        drawAxis: false,
+      }
+    },
     series: {
       Y: { fillGraph: true },
     },
@@ -49,20 +55,6 @@ perSeriesTestCase.prototype.testPerSeriesFill = function() {
   assertEquals([255,0,0,38], sampler.colorAtCoordinate(6.5, 0.5));
 };
 
-perSeriesTestCase.prototype.testOldStyleSeries = function() {
-  var opts = {
-    pointSize : 5,
-    Y: { pointSize : 4 },
-  };
-  var graph = document.getElementById("graph");
-  var data = "X,Y,Z\n1,0,0\n";
-  g = new Dygraph(graph, data, opts);
-
-  assertEquals(5, g.getOption("pointSize"));
-  assertEquals(4, g.getOption("pointSize", "Y"));
-  assertEquals(5, g.getOption("pointSize", "Z"));
-};
-
 perSeriesTestCase.prototype.testNewStyleSeries = function() {
   var opts = {
     pointSize : 5,
@@ -79,29 +71,6 @@ perSeriesTestCase.prototype.testNewStyleSeries = function() {
   assertEquals(5, g.getOption("pointSize", "Z"));
 };
 
-perSeriesTestCase.prototype.testNewStyleSeriesTrumpsOldStyle = function() {
-  var opts = {
-    pointSize : 5,
-    Z : { pointSize : 6 },
-    series : {
-      Y: { pointSize : 4 }
-    },
-  };
-  var graph = document.getElementById("graph");
-  var data = "X,Y,Z\n1,0,0\n";
-  g = new Dygraph(graph, data, opts);
-
-  assertEquals(5, g.getOption("pointSize"));
-  assertEquals(4, g.getOption("pointSize", "Y"));
-  assertEquals(5, g.getOption("pointSize", "Z"));
-
-  // Erase the series object, and Z will become visible again.
-  g.updateOptions({ series : undefined });
-  assertEquals(5, g.getOption("pointSize"));
-  assertEquals(6, g.getOption("pointSize", "Z"));
-  assertEquals(5, g.getOption("pointSize", "Y"));
-};
-
 // TODO(konigsberg): move to multiple_axes.js
 perSeriesTestCase.prototype.testAxisInNewSeries = function() {
   var opts = {