Merge pull request #674 from danvk/module

[dygraphs.git] / auto_tests / tests / dygraph-options-tests.js

diff --git a/auto_tests/tests/dygraph-options-tests.js b/auto_tests/tests/dygraph-options-tests.js
index 4311fb5..ded9ee3 100644 (file)
--- a/auto_tests/tests/dygraph-options-tests.js
+++ b/auto_tests/tests/dygraph-options-tests.js
@@ -1,18 +1,21 @@
 /** 
  * @fileoverview Test cases for DygraphOptions.
  */
+
+import Dygraph from '../../src/dygraph';
+import DygraphOptions from '../../src/dygraph-options';
+import OPTIONS_REFERENCE from '../../src/dygraph-options-reference';
+
 describe("dygraph-options-tests", function() {
 
+cleanupAfterEach();
+
 var graph;
 
 beforeEach(function() {
-  document.body.innerHTML = "<div id='graph'></div>";
   graph = document.getElementById("graph");
 });
 
-afterEach(function() {
-});
-
 /*
  * Pathalogical test to ensure getSeriesNames works
  */
@@ -74,7 +77,7 @@ var getWarnings = function(div, data, opts) {
 };
 
 it('testLogWarningForNonexistentOption', function() {
-  if (typeof(Dygraph.OPTIONS_REFERENCE) === 'undefined') {
+  if (!OPTIONS_REFERENCE) {
     return;  // this test won't pass in non-debug mode.
   }
 
@@ -103,7 +106,7 @@ it('testLogWarningForNonexistentOption', function() {
 });
 
 it('testOnlyLogsEachWarningOnce', function() {
-  if (typeof(Dygraph.OPTIONS_REFERENCE) === 'undefined') {
+  if (!OPTIONS_REFERENCE) {
     return;  // this test won't pass in non-debug mode.
   }