X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Fto_dom_coords.js;h=e5bda3b1918d654e76c51b73161195cf35bd7dde;hb=287c4d68da47248a301bc9087d3b3c7f4ea36a44;hp=5aa452018d61308c6dab3c7592a0dbeaa715eca0;hpb=8bd58e55cfd7d903d68ec434be1f17f78dc11de1;p=dygraphs.git

diff --git a/auto_tests/tests/to_dom_coords.js b/auto_tests/tests/to_dom_coords.js
index 5aa4520..e5bda3b 100644
--- a/auto_tests/tests/to_dom_coords.js
+++ b/auto_tests/tests/to_dom_coords.js
@@ -3,20 +3,17 @@
  *
  * @author danvk@google.com (Dan Vanderkam)
  */
+import Dygraph from '../../src/dygraph';
+import * as utils from '../../src/dygraph-utils';
 
-describe("to-dom-coords", function() {
+import Proxy from './Proxy';
+import CanvasAssertions from './CanvasAssertions';
+import {assertDeepCloseTo} from './custom_asserts';
 
-var origFunc = Dygraph.getContext;
-beforeEach(function() {
-  document.body.innerHTML = "<div id='graph'></div>";
-  Dygraph.getContext = function(canvas) {
-    return new Proxy(origFunc(canvas));
-  }
-});
+describe("to-dom-coords", function() {
 
-afterEach(function() {
-  Dygraph.getContext = origFunc;
-});
+cleanupAfterEach();
+useProxyCanvas(utils, Proxy);
 
 // Checks that toDomCoords and toDataCoords are inverses of one another.
 var checkForInverses = function(g) {
@@ -228,6 +225,20 @@ it('testChartLogarithmic_YAxis', function() {
   assert.deepEqual([400, 0], g.toDomCoords(10, 4));
   assert.deepEqual([400, 400], g.toDomCoords(10, 1));
   assert.deepEqual([400, 200], g.toDomCoords(10, 2));
+
+  // Verify that the margins are adjusted appropriately for yRangePad.
+  g.updateOptions({yRangePad: 40});
+  assertDeepCloseTo([0, 4], g.toDataCoords(0, 40), epsilon);
+  assertDeepCloseTo([0, 1], g.toDataCoords(0, 360), epsilon);
+  assertDeepCloseTo([10, 4], g.toDataCoords(400, 40), epsilon);
+  assertDeepCloseTo([10, 1], g.toDataCoords(400, 360), epsilon);
+  assertDeepCloseTo([10, 2], g.toDataCoords(400, 200), epsilon);
+
+  assertDeepCloseTo([0, 40], g.toDomCoords(0, 4), epsilon);
+  assertDeepCloseTo([0, 360], g.toDomCoords(0, 1), epsilon);
+  assertDeepCloseTo([400, 40], g.toDomCoords(10, 4), epsilon);
+  assertDeepCloseTo([400, 360], g.toDomCoords(10, 1), epsilon);
+  assertDeepCloseTo([400, 200], g.toDomCoords(10, 2), epsilon);
 });
 
 it('testChartLogarithmic_XAxis', function() {