Skip to content

chore(ci): ie and edge tests should be able to run #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 27, 2018
Merged

chore(ci): ie and edge tests should be able to run #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9f74b3b
make tests run in IE and Edge
stipsan May 27, 2018
7e78959
Merge branch 'master' into fix-ie-and-edge
stipsan May 27, 2018
9e0b4a4
fix identifiers
stipsan May 27, 2018
a402f72
fix
stipsan May 27, 2018
3354620
babel + prettier
stipsan May 27, 2018
dad8d33
grrrr ie
stipsan May 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 41 additions & 37 deletions tests/web-platform/css/cssom-view/scrollintoview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
<div id=testDiv></div>
<div id="log"></div>
<script>
var testDiv = document.getElementById('testDiv');
var testDiv = document.getElementById("testDiv");

var expectedXLeft = 4000;
var expectedXRight = 4000 - window.innerWidth + testDiv.clientWidth;
var expectedXCenter = 4000 - (window.innerWidth / 2) + (testDiv.clientWidth / 2);
var expectedXCenter = 4000 - window.innerWidth / 2 + testDiv.clientWidth / 2;

var expectedYTop = 4000;
var expectedYBottom = 4000 - window.innerHeight + testDiv.clientHeight;
var expectedYCenter = 4000 - (window.innerHeight / 2) + (testDiv.clientHeight / 2);
var expectedYCenter = 4000 - window.innerHeight / 2 + testDiv.clientHeight / 2;

[
["omitted argument", "nearest", expectedYTop],
Expand All @@ -39,46 +39,50 @@
[undefined, "nearest", expectedYTop],
[null, "nearest", expectedYTop],
[{}, "nearest", expectedYTop],
[{block: "center", inline: "center"}, expectedXCenter, expectedYCenter],
[{block: "start", inline: "start"}, expectedXLeft, expectedYTop],
[{block: "end", inline: "end"}, expectedXRight, expectedYBottom],
[{block: "nearest", inline: "nearest"}, "nearest", "nearest"],
].forEach(([input, expectedX, expectedY]) => {
test(() => {
[{ block: "center", inline: "center" }, expectedXCenter, expectedYCenter],
[{ block: "start", inline: "start" }, expectedXLeft, expectedYTop],
[{ block: "end", inline: "end" }, expectedXRight, expectedYBottom],
[{ block: "nearest", inline: "nearest" }, "nearest", "nearest"]
].forEach(function(_ref) {
var input = _ref[0],
expectedX = _ref[1],
expectedY = _ref[2];

test(function() {
window.scrollTo(0, 0);
testScrollIntoView(input);
var x = (expectedX === "nearest") ? expectedXRight : expectedX;
var y = (expectedY === "nearest") ? expectedYBottom : expectedY;
assert_approx_equals(window.scrollX, x, 0.5, 'scrollX');
assert_approx_equals(window.scrollY, y, 0.5, 'scrollY');
}, `scrollIntoView(${format_input(input)}) starting at left,top`);
var x = expectedX === "nearest" ? expectedXRight : expectedX;
var y = expectedY === "nearest" ? expectedYBottom : expectedY;
assert_approx_equals(window.scrollX || window.pageXOffset, x, 0.5, "scrollX");
assert_approx_equals(window.scrollY || window.pageYOffset, y, 0.5, "scrollY");
}, "scrollIntoView(" + format_input(input) + ") starting at left,top");

test(() => {
test(function() {
window.scrollTo(0, 12000);
testScrollIntoView(input);
var x = (expectedX === "nearest") ? expectedXRight : expectedX;
var y = (expectedY === "nearest") ? expectedYTop : expectedY;
assert_approx_equals(window.scrollX, x, 0.5, 'scrollX');
assert_approx_equals(window.scrollY, y, 0.5, 'scrollY');
}, `scrollIntoView(${format_input(input)}) starting at left,bottom`);
var x = expectedX === "nearest" ? expectedXRight : expectedX;
var y = expectedY === "nearest" ? expectedYTop : expectedY;
assert_approx_equals(window.scrollX || window.pageXOffset, x, 0.5, "scrollX");
assert_approx_equals(window.scrollY || window.pageYOffset, y, 0.5, "scrollY");
}, "scrollIntoView(" + format_input(input) + ") starting at left,bottom");

test(() => {
test(function() {
window.scrollTo(12000, 0);
testScrollIntoView(input);
var x = (expectedX === "nearest") ? expectedXLeft : expectedX;
var y = (expectedY === "nearest") ? expectedYBottom : expectedY;
assert_approx_equals(window.scrollX, x, 0.5, 'scrollX');
assert_approx_equals(window.scrollY, y, 0.5, 'scrollY');
}, `scrollIntoView(${format_input(input)}) starting at right,top`);
var x = expectedX === "nearest" ? expectedXLeft : expectedX;
var y = expectedY === "nearest" ? expectedYBottom : expectedY;
assert_approx_equals(window.scrollX || window.pageXOffset, x, 0.5, "scrollX");
assert_approx_equals(window.scrollY || window.pageYOffset, y, 0.5, "scrollY");
}, "scrollIntoView(" + format_input(input) + ") starting at right,top");

test(() => {
test(function() {
window.scrollTo(12000, 12000);
testScrollIntoView(input);
var x = (expectedX === "nearest") ? expectedXLeft : expectedX;
var y = (expectedY === "nearest") ? expectedYTop : expectedY;
assert_approx_equals(window.scrollX, x, 0.5, 'scrollX');
assert_approx_equals(window.scrollY, y, 0.5, 'scrollY');
}, `scrollIntoView(${format_input(input)}) starting at right,bottom`);
var x = expectedX === "nearest" ? expectedXLeft : expectedX;
var y = expectedY === "nearest" ? expectedYTop : expectedY;
assert_approx_equals(window.scrollX || window.pageXOffset, x, 0.5, "scrollX");
assert_approx_equals(window.scrollY || window.pageYOffset, y, 0.5, "scrollY");
}, "scrollIntoView(" + format_input(input) + ") starting at right,bottom");
});

function testScrollIntoView(input) {
Expand All @@ -93,11 +97,11 @@
// format_value() is provided by testharness.js,
// which also preserves sign for -0.
function format_dict(dict) {
const props = [];
for (let prop in dict) {
props.push(`${prop}: ${format_value(dict[prop])}`);
var props = [];
for (var prop in dict) {
props.push(prop + ": " + format_value(dict[prop]));
}
return `{${props.join(', ')}}`;
return "{" + props.join(", ") + "}";
}

function format_input(input) {
Expand All @@ -109,6 +113,6 @@
return format_dict(input);
}

document.body.classList.remove('running');
document.body.classList.remove("running");
window.scrollTo(0, 0);
</script>
19 changes: 13 additions & 6 deletions tests/web-platform/custom/borders.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,19 +167,26 @@
[8, "end", "end", [{ x: 100, y: 100 }, { x: 145, y: 145 }]],
[0, "nearest", "nearest", [{ x: 23, y: 23 }, { x: 0, y: 0 }]],
[8, "nearest", undefined, [{ x: 100, y: 100 }, { x: 145, y: 145 }]]
].forEach(([target, block, inline, [outer, inner]]) => {
test(() => {
].forEach(function(suite) {
var target = suite[0];
var block = suite[1];
var inline = suite[2];
var outer = suite[3][0];
var inner = suite[3][1];
test(function() {
window.scrollTo(0, 0);
outerContainer.scrollTo(0, 0);
innerContainer.scrollTo(0, 0);
scrollIntoView(tiles[target], {block, inline});
outerContainer.scrollTop = 0
outerContainer.scrollLeft = 0
innerContainer.scrollTop = 0
innerContainer.scrollLeft = 0
scrollIntoView(tiles[target], {block: block, inline: inline});
//tiles[target].scrollIntoView({block, inline});

assert_approx_equals(outerContainer.scrollLeft, outer.x, 1, 'outerContainer.scrollLeft');
assert_approx_equals(outerContainer.scrollTop, outer.y, 1, 'outerContainer.scrollTop');
assert_approx_equals(innerContainer.scrollLeft, inner.x, 1, 'innerContainer.scrollLeft');
assert_approx_equals(innerContainer.scrollTop, inner.y, 1, 'innerContainer.scrollTop');
}, `scrollIntoView(${JSON.stringify({block, inline})})`);
}, 'scrollIntoView('+JSON.stringify({block: block, inline: inline})+')');
});

document.body.classList.remove('running');
Expand Down