Merge pull request #574 from danvk/test-warnings

[dygraphs.git] / auto_tests / tests / formats.js

diff --git a/auto_tests/tests/formats.js b/auto_tests/tests/formats.js
index 36b36c9..a0b779b 100644 (file)
--- a/auto_tests/tests/formats.js
+++ b/auto_tests/tests/formats.js
@@ -24,6 +24,7 @@ var dataArray =
   [1,0],
   [2,1],
   [3,0]];
+var BASE_OPTS = {labels: ['X', 'Y']};
 
 it('testCsv', function() {
   var data = dataString;
@@ -35,18 +36,16 @@ it('testCsv', function() {
 it('testArray', function() {
   var data = dataArray;
   var graph = document.getElementById("graph");
-  var g = new Dygraph(graph, data, {});
+  var g = new Dygraph(graph, data, BASE_OPTS);
   assertData(g);
 });
 
 it('testFunctionReturnsCsv', function() {
-  var string = dataString;
-  var data = function() { return string; };
+  var data = function() { return dataString; };
 
   var graph = document.getElementById("graph");
   var g = new Dygraph(graph, data, {});
-  // assertData(g);
-  console.log("x");
+  assertData(g);
 });
 
 it('testFunctionDefinesArray', function() {
@@ -54,7 +53,7 @@ it('testFunctionDefinesArray', function() {
   var data = function() { return array; }
 
   var graph = document.getElementById("graph");
-  var g = new Dygraph(graph, data, {});
+  var g = new Dygraph(graph, data, BASE_OPTS);
   assertData(g);
 });