X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Fupdate_options.js;h=ea3dfaaac4cb38cbb8c49a712d35124d3f7c4488;hb=89fdcedbda6906d90e15d84285c4f6c0b8d96d28;hp=557dac881b337b65ffb524c0ce0d37e7a68c4d6b;hpb=319d0361d2e512ed8049dfedffd79254e491201c;p=dygraphs.git

diff --git a/auto_tests/tests/update_options.js b/auto_tests/tests/update_options.js
index 557dac8..ea3dfaa 100644
--- a/auto_tests/tests/update_options.js
+++ b/auto_tests/tests/update_options.js
@@ -4,7 +4,7 @@
  * @fileoverview Tests for the updateOptions function.
  * @author antrob@google.com (Anthony Robledo)
  */
-var UpdateOptionsTestCase = TestCase("update-options");
+describe("update-options", function() {
   
 var opts = {
   width: 480,
@@ -18,12 +18,12 @@ var data = "X,Y1,Y2\n" +
   "2011-04-04,9,5\n" +
   "2011-05-05,8,3\n";
 
-UpdateOptionsTestCase.prototype.setUp = function() {
+beforeEach(function() {
   document.body.innerHTML = "<div id='graph'></div><div id='labels'></div>";
-};
+});
 
-UpdateOptionsTestCase.prototype.tearDown = function() {
-};
+afterEach(function() {
+});
 
 /*
  * Tweaks the dygraph so it sets g._testDrawCalled to true when internal method
@@ -45,7 +45,7 @@ var unwrapDrawGraph = function(g) {
   g.drawGraph_ = g._oldDrawGraph;
 }
 
-UpdateOptionsTestCase.prototype.testStrokeAll = function() {
+it('testStrokeAll', function() {
   var graphDiv = document.getElementById("graph");
   var graph = new Dygraph(graphDiv, data, opts);
   var updatedOptions = { };
@@ -57,10 +57,10 @@ UpdateOptionsTestCase.prototype.testStrokeAll = function() {
   wrapDrawGraph(graph);
   graph.updateOptions(updatedOptions);
   unwrapDrawGraph(graph);
-  assertFalse(graph._testDrawCalled);
-};
+  assert.isFalse(graph._testDrawCalled);
+});
 
-UpdateOptionsTestCase.prototype.testStrokeSingleSeries = function() {
+it('testStrokeSingleSeries', function() {
   var graphDiv = document.getElementById("graph");
   var graph = new Dygraph(graphDiv, data, opts);
   var updatedOptions = { };
@@ -74,10 +74,10 @@ UpdateOptionsTestCase.prototype.testStrokeSingleSeries = function() {
   wrapDrawGraph(graph);
   graph.updateOptions(updatedOptions);
   unwrapDrawGraph(graph);
-  assertFalse(graph._testDrawCalled);
-};
+  assert.isFalse(graph._testDrawCalled);
+});
  
-UpdateOptionsTestCase.prototype.testSingleSeriesRequiresNewPoints = function() {
+it('testSingleSeriesRequiresNewPoints', function() {
   var graphDiv = document.getElementById("graph");
   var graph = new Dygraph(graphDiv, data, opts);
   var updatedOptions = {
@@ -96,10 +96,10 @@ UpdateOptionsTestCase.prototype.testSingleSeriesRequiresNewPoints = function() {
   wrapDrawGraph(graph);
   graph.updateOptions(updatedOptions);
   unwrapDrawGraph(graph);
-  assertTrue(graph._testDrawCalled);
-};
+  assert.isTrue(graph._testDrawCalled);
+});
 
-UpdateOptionsTestCase.prototype.testWidthChangeNeedsNewPoints = function() {
+it('testWidthChangeNeedsNewPoints', function() {
   var graphDiv = document.getElementById("graph");
   var graph = new Dygraph(graphDiv, data, opts);
   var updatedOptions = { };
@@ -112,62 +112,64 @@ UpdateOptionsTestCase.prototype.testWidthChangeNeedsNewPoints = function() {
   wrapDrawGraph(graph);
   graph.updateOptions(updatedOptions);
   unwrapDrawGraph(graph);
-  assertTrue(graph._testDrawCalled);
-};
+  assert.isTrue(graph._testDrawCalled);
+});
 
 // Test https://github.com/danvk/dygraphs/issues/87
-UpdateOptionsTestCase.prototype.testUpdateLabelsDivDoesntInfiniteLoop = function() {
+it('testUpdateLabelsDivDoesntInfiniteLoop', function() {
   var graphDiv = document.getElementById("graph");
   var labelsDiv = document.getElementById("labels");
   var graph = new Dygraph(graphDiv, data, opts);
   graph.updateOptions({labelsDiv : labelsDiv});
-}
+});
 
 // Test https://github.com/danvk/dygraphs/issues/247
-UpdateOptionsTestCase.prototype.testUpdateColors = function() {
+it('testUpdateColors', function() {
   var graphDiv = document.getElementById("graph");
   var graph = new Dygraph(graphDiv, data, opts);
 
   var defaultColors = ["rgb(0,128,0)", "rgb(0,0,128)"];
-  assertEquals(["rgb(0,128,0)", "rgb(0,0,128)"], graph.getColors());
+  assert.deepEqual(["rgb(0,128,0)", "rgb(0,0,128)"], graph.getColors());
 
   var colors1 = [ "#aaa", "#bbb" ];
   graph.updateOptions({ colors: colors1 });
-  assertEquals(colors1, graph.getColors());
+  assert.equal(colors1, graph.getColors());
 
   // extra colors are ignored until you add additional data series.
   var colors2 = [ "#ddd", "#eee", "#fff" ];
   graph.updateOptions({ colors: colors2 });
-  assertEquals(["#ddd", "#eee"], graph.getColors());
+  assert.deepEqual(["#ddd", "#eee"], graph.getColors());
 
   graph.updateOptions({ file:
       "X,Y1,Y2,Y3\n" +
       "2011-01-01,2,3,4\n" +
       "2011-02-02,5,3,2\n"
   });
-  assertEquals(colors2, graph.getColors());
+  assert.equal(colors2, graph.getColors());
 
   graph.updateOptions({ colors: null, file: data });
-  assertEquals(defaultColors, graph.getColors());
-}
+  assert.equal(defaultColors, graph.getColors());
+});
 
 // Regression test for http://code.google.com/p/dygraphs/issues/detail?id=249
 // Verifies that setting 'legend: always' via update immediately shows the
 // legend.
-UpdateOptionsTestCase.prototype.testUpdateLegendAlways = function() {
+it('testUpdateLegendAlways', function() {
   var graphDiv = document.getElementById("graph");
   var graph = new Dygraph(graphDiv, data, opts);
 
   var legend = document.getElementsByClassName("dygraph-legend");
-  assertEquals(1, legend.length);
+  assert.equal(1, legend.length);
   legend = legend[0];
-  assertEquals("", legend.innerHTML);
+  assert.equal("", legend.innerHTML);
 
   graph.updateOptions({legend: 'always'});
 
   legend = document.getElementsByClassName("dygraph-legend");
-  assertEquals(1, legend.length);
+  assert.equal(1, legend.length);
   legend = legend[0];
-  assertNotEquals(-1, legend.textContent.indexOf("Y1"));
-  assertNotEquals(-1, legend.textContent.indexOf("Y2"));
-};
+  assert.notEqual(-1, legend.textContent.indexOf("Y1"));
+  assert.notEqual(-1, legend.textContent.indexOf("Y2"));
+});
+
+});