Use DygraphOps.dispatchXXX method instead of updateOptions

diff --git a/auto_tests/tests/interaction_model.js b/auto_tests/tests/interaction_model.js
index 52338e9..4646ff8 100644 (file)
--- a/auto_tests/tests/interaction_model.js
+++ b/auto_tests/tests/interaction_model.js
@@ -333,18 +333,34 @@ InteractionModelTestCase.prototype.testIsZoomed_updateOptions_both = function()
 };
 
 
-InteractionModelTestCase.prototype.testCorrectYAxisValueRangeAfterUnzoom = function() {
-  var g = new Dygraph(document.getElementById("graph"), data2, {valueRange:[1,50],animatedZooms:true});
+InteractionModelTestCase.prototype.testCorrectAxisValueRangeAfterUnzoom = function() {
+  var g = new Dygraph(document.getElementById("graph"), data2, {valueRange:[1,50],dateRange:[1,9],animatedZooms:false});
   
-  currentYAxisRange = g.yAxisRange(0);
-  assertEquals(1,currentYAxisRange[0]);
-  assertEquals(50,currentYAxisRange[1]);
-  
-  g.updateOptions({dateWindow: [-1, 1], valueWindow: [5, 10]});
+  // Zoom x axis
+  DygraphOps.dispatchMouseDown_Point(g, 10, 10);
+  DygraphOps.dispatchMouseMove_Point(g, 30, 10);
+  DygraphOps.dispatchMouseUp_Point(g, 30, 10);
 
+  // Zoom y axis
+  DygraphOps.dispatchMouseDown_Point(g, 10, 10);
+  DygraphOps.dispatchMouseMove_Point(g, 10, 30);
+  DygraphOps.dispatchMouseUp_Point(g, 10, 30);
+  currentYAxisRange = g.yAxisRange();
+  currentXAxisRange = g.xAxisRange();
+  
+  //check that the range for the axis has changed
+  assertNotEquals(1,currentXAxisRange[0]);
+  assertNotEquals(10,currentXAxisRange[1]);
+  assertNotEquals(1,currentYAxisRange[0]);
+  assertNotEquals(50,currentYAxisRange[1]);
+  
+  // unzoom by doubleclick
   DygraphOps.dispatchDoubleClick(g, null);
   
-  newYAxisRange = g.yAxisRange(0);
+  // check if range for y-axis was reset to original value 
+  // TODO check if range for x-axis is correct. 
+  // Currently not possible because dateRange is set to null and extremes are returned
+  newYAxisRange = g.yAxisRange();
   assertEquals(1,newYAxisRange[0]);
   assertEquals(50,newYAxisRange[1]);
 };