X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Fper_axis.js;fp=auto_tests%2Ftests%2Fper_axis.js;h=4ae620884fcc296083aad2189c980726725b7690;hb=3123ca57f71d145bb5bcc4a2f754d3dff3225346;hp=279765e89c8f5e112ba975c105e17ea57c243638;hpb=26ee953643ccd2d32e38e6b60b20e6a01c1dc9ba;p=dygraphs.git

diff --git a/auto_tests/tests/per_axis.js b/auto_tests/tests/per_axis.js
index 279765e..4ae6208 100644
--- a/auto_tests/tests/per_axis.js
+++ b/auto_tests/tests/per_axis.js
@@ -3,30 +3,32 @@
  *
  * @author konigsberg@google.com (Robert Konigsberg)
  */
-var perAxisTestCase = TestCase("per-axis");
+describe("per-axis", function() {
 
-perAxisTestCase._origGetContext = Dygraph.getContext;
+var _origGetContext = Dygraph.getContext;
 
-perAxisTestCase.prototype.setUp = function() {
+var xAxisLineColor = "#00ffff";
+var yAxisLineColor = "#ffff00";
+
+var g, graph;
+
+beforeEach(function() {
   document.body.innerHTML = "<div id='graph'></div>";
   Dygraph.getContext = function(canvas) {
-    return new Proxy(perAxisTestCase._origGetContext(canvas));
+    return new Proxy(_origGetContext(canvas));
   }
 
-  this.xAxisLineColor = "#00ffff";
-  this.yAxisLineColor = "#ffff00";
-
   var opts = {
     axes : {
       x : {
         drawAxis : false,
         drawGrid : false,
-        gridLineColor : this.xAxisLineColor
+        gridLineColor : xAxisLineColor
       },
       y : {
         drawAxis : false,
         drawGrid : false,
-        gridLineColor : this.yAxisLineColor
+        gridLineColor : yAxisLineColor
       }
     },
     colors: [ '#ff0000', '#0000ff' ]
@@ -36,36 +38,38 @@ perAxisTestCase.prototype.setUp = function() {
       "1,1,0\n" +
       "8,0,1\n"
   ;
-  this.graph = document.getElementById('graph');
-  this.g = new Dygraph(this.graph, data, opts);
-};
+  graph = document.getElementById('graph');
+  g = new Dygraph(graph, data, opts);
+});
+
+afterEach(function() {
+  Dygraph.getContext = _origGetContext;
+});
 
-perAxisTestCase.prototype.tearDown = function() {
-  Dygraph.getContext = perAxisTestCase._origGetContext;
-};
+it('testDrawXAxis', function() {
+  g.updateOptions({ axes : { x : { drawAxis: true }} });
+  assert.isTrue(graph.getElementsByClassName('dygraph-axis-label-x').length > 0);
+  assert.isTrue(graph.getElementsByClassName('dygraph-axis-label-y').length == 0);
+});
 
-perAxisTestCase.prototype.testDrawXAxis = function() {
-  this.g.updateOptions({ axes : { x : { drawAxis: true }} });
-  assertTrue(this.graph.getElementsByClassName('dygraph-axis-label-x').length > 0);
-  assertTrue(this.graph.getElementsByClassName('dygraph-axis-label-y').length == 0);
-}
+it('testDrawYAxis', function() {
+  g.updateOptions({ axes : { y : { drawAxis: true }} });
+  assert.isTrue(graph.getElementsByClassName('dygraph-axis-label-x').length ==0);
+  assert.isTrue(graph.getElementsByClassName('dygraph-axis-label-y').length > 0);
+});
 
-perAxisTestCase.prototype.testDrawYAxis = function() {
-  this.g.updateOptions({ axes : { y : { drawAxis: true }} });
-  assertTrue(this.graph.getElementsByClassName('dygraph-axis-label-x').length ==0);
-  assertTrue(this.graph.getElementsByClassName('dygraph-axis-label-y').length > 0);
-}
+it('testDrawXGrid', function() {
+  g.updateOptions({ axes : { x : { drawGrid : true }}});
+  var htx = g.hidden_ctx_;
+  assert.isTrue(CanvasAssertions.numLinesDrawn(htx, xAxisLineColor) > 0);
+  assert.isTrue(CanvasAssertions.numLinesDrawn(htx, yAxisLineColor) == 0);
+});
 
-perAxisTestCase.prototype.testDrawXGrid = function() {
-  this.g.updateOptions({ axes : { x : { drawGrid : true }}});
-  var htx = this.g.hidden_ctx_;
-  assertTrue(CanvasAssertions.numLinesDrawn(htx, this.xAxisLineColor) > 0);
-  assertTrue(CanvasAssertions.numLinesDrawn(htx, this.yAxisLineColor) == 0);
-}
+it('testDrawYGrid', function() {
+  g.updateOptions({ axes : { y : { drawGrid : true }}});
+  var htx = g.hidden_ctx_;
+  assert.isTrue(CanvasAssertions.numLinesDrawn(htx, xAxisLineColor) == 0);
+  assert.isTrue(CanvasAssertions.numLinesDrawn(htx, yAxisLineColor) > 0);
+});
 
-perAxisTestCase.prototype.testDrawYGrid = function() {
-  this.g.updateOptions({ axes : { y : { drawGrid : true }}});
-  var htx = this.g.hidden_ctx_;
-  assertTrue(CanvasAssertions.numLinesDrawn(htx, this.xAxisLineColor) == 0);
-  assertTrue(CanvasAssertions.numLinesDrawn(htx, this.yAxisLineColor) > 0);
-}
+});