2.0.0 release fixes (#815)

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

diff --git a/auto_tests/tests/formats.js b/auto_tests/tests/formats.js
index 36b36c9..2548d99 100644 (file)
--- a/auto_tests/tests/formats.js
+++ b/auto_tests/tests/formats.js
@@ -3,14 +3,12 @@
  *
  * @author konigsberg@google.com (Robert Konigsberg)
  */
-describe("formats", function() {
 
-beforeEach(function() {
-  document.body.innerHTML = "<div id='graph'></div>";
-});
+import Dygraph from '../../src/dygraph';
 
-afterEach(function() {
-});
+describe("formats", function() {
+
+cleanupAfterEach();
 
 var dataString =
   "X,Y\n" +
@@ -24,6 +22,7 @@ var dataArray =
   [1,0],
   [2,1],
   [3,0]];
+var BASE_OPTS = {labels: ['X', 'Y']};
 
 it('testCsv', function() {
   var data = dataString;
@@ -35,18 +34,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 +51,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);
 });
 
@@ -80,6 +77,16 @@ it('testXValueParser', function() {
   assert.equal(6, g.getValue(3, 0));
 });
 
+it('should throw on strings in native format', () => {
+  assert.throws(() => {
+    new Dygraph('graph', [['1', '10'], ['2', '20']])
+  }, /expected number or date/i);
+
+  assert.throws(() => {
+    new Dygraph('graph', [[new Date(), '10'], [new Date(), '20']])
+  }, /expected number or array/i);
+});
+
 var assertData = function(g) {
   var expected = dataArray;