projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #674 from danvk/module
[dygraphs.git]
/
auto_tests
/
tests
/
scrolling_div.js
diff --git
a/auto_tests/tests/scrolling_div.js
b/auto_tests/tests/scrolling_div.js
index
ce95a7e
..
c9dec0c
100644
(file)
--- a/
auto_tests/tests/scrolling_div.js
+++ b/
auto_tests/tests/scrolling_div.js
@@
-3,6
+3,10
@@
*
* @author konigsberg@google.com (Robert Konigsbrg)
*/
*
* @author konigsberg@google.com (Robert Konigsbrg)
*/
+
+import Dygraph from '../../src/dygraph';
+import DygraphOps from './DygraphOps';
+
describe("scrolling-div", function() {
var point, g;
describe("scrolling-div", function() {
var point, g;
@@
-18,13
+22,19
@@
var LOREM_IPSUM =
"non proident, sunt in culpa qui officia deserunt mollit anim id est\n" +
"laborum.</p>";
"non proident, sunt in culpa qui officia deserunt mollit anim id est\n" +
"laborum.</p>";
- document.body.innerHTML =
+ var testDiv = document.getElementById('graph');
+ testDiv.innerHTML =
"<div id='scroller' style='overflow: scroll; height: 450px; width: 800px;'>" +
"<div id='scroller' style='overflow: scroll; height: 450px; width: 800px;'>" +
- "<div id='graph'></div>" +
+ "<div id='graph
-inner
'></div>" +
"<div style='height:100px; background-color:green;'>" + LOREM_IPSUM + " </div>" +
"<div style='height:100px; background-color:red;'>" + LOREM_IPSUM + "</div>" +
"</div>";
"<div style='height:100px; background-color:green;'>" + LOREM_IPSUM + " </div>" +
"<div style='height:100px; background-color:red;'>" + LOREM_IPSUM + "</div>" +
"</div>";
+ // The old test runner had an 8px margin on the body
+ // The Mocha test runner does not. We set it on the test div to keep the
+ // coordinates the same.
+ testDiv.style.margin = '8px';
+
var data = [
[ 10, 1 ],
[ 20, 3 ],
var data = [
[ 10, 1 ],
[ 20, 3 ],
@@
-35,7
+45,7
@@
var LOREM_IPSUM =
[ 70, 4 ],
[ 80, 6 ] ];
[ 70, 4 ],
[ 80, 6 ] ];
- var graph = document.getElementById("graph");
+ var graph = document.getElementById("graph
-inner
");
point = null;
g = new Dygraph(graph, data,
point = null;
g = new Dygraph(graph, data,
@@
-74,9
+84,6
@@
var detectScrollbarWidth = function() {
return scrollbarWidth;
};
return scrollbarWidth;
};
-afterEach(function() {
-});
-
/**
* This tests that when the nested div is unscrolled, things work normally.
*/
/**
* This tests that when the nested div is unscrolled, things work normally.
*/