Skip to content

Commit 540ecab

Browse files
stipsanstipsan
authored
fix(ci): ie and edge tests should be able to run (#258)
chore(ci): ie and edge tests should be able to run
1 parent aa259ab commit 540ecab

File tree

2 files changed

+54
-43
lines changed

2 files changed

+54
-43
lines changed

‎tests/web-platform/css/cssom-view/scrollintoview.html

+41-37
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
<div id=testDiv></div>
2323
<div id="log"></div>
2424
<script>
25-
var testDiv = document.getElementById('testDiv');
25+
var testDiv = document.getElementById("testDiv");
2626

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

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

3535
[
3636
["omitted argument", "nearest", expectedYTop],
@@ -39,46 +39,50 @@
3939
[undefined, "nearest", expectedYTop],
4040
[null, "nearest", expectedYTop],
4141
[{}, "nearest", expectedYTop],
42-
[{block: "center", inline: "center"}, expectedXCenter, expectedYCenter],
43-
[{block: "start", inline: "start"}, expectedXLeft, expectedYTop],
44-
[{block: "end", inline: "end"}, expectedXRight, expectedYBottom],
45-
[{block: "nearest", inline: "nearest"}, "nearest", "nearest"],
46-
].forEach(([input, expectedX, expectedY]) => {
47-
test(() => {
42+
[{ block: "center", inline: "center" }, expectedXCenter, expectedYCenter],
43+
[{ block: "start", inline: "start" }, expectedXLeft, expectedYTop],
44+
[{ block: "end", inline: "end" }, expectedXRight, expectedYBottom],
45+
[{ block: "nearest", inline: "nearest" }, "nearest", "nearest"]
46+
].forEach(function(_ref) {
47+
var input = _ref[0],
48+
expectedX = _ref[1],
49+
expectedY = _ref[2];
50+
51+
test(function() {
4852
window.scrollTo(0, 0);
4953
testScrollIntoView(input);
50-
var x = (expectedX === "nearest") ? expectedXRight : expectedX;
51-
var y = (expectedY === "nearest") ? expectedYBottom : expectedY;
52-
assert_approx_equals(window.scrollX, x, 0.5, 'scrollX');
53-
assert_approx_equals(window.scrollY, y, 0.5, 'scrollY');
54-
}, `scrollIntoView(${format_input(input)}) starting at left,top`);
54+
var x = expectedX === "nearest" ? expectedXRight : expectedX;
55+
var y = expectedY === "nearest" ? expectedYBottom : expectedY;
56+
assert_approx_equals(window.scrollX || window.pageXOffset, x, 0.5, "scrollX");
57+
assert_approx_equals(window.scrollY || window.pageYOffset, y, 0.5, "scrollY");
58+
}, "scrollIntoView(" + format_input(input) + ") starting at left,top");
5559

56-
test(() => {
60+
test(function() {
5761
window.scrollTo(0, 12000);
5862
testScrollIntoView(input);
59-
var x = (expectedX === "nearest") ? expectedXRight : expectedX;
60-
var y = (expectedY === "nearest") ? expectedYTop : expectedY;
61-
assert_approx_equals(window.scrollX, x, 0.5, 'scrollX');
62-
assert_approx_equals(window.scrollY, y, 0.5, 'scrollY');
63-
}, `scrollIntoView(${format_input(input)}) starting at left,bottom`);
63+
var x = expectedX === "nearest" ? expectedXRight : expectedX;
64+
var y = expectedY === "nearest" ? expectedYTop : expectedY;
65+
assert_approx_equals(window.scrollX || window.pageXOffset, x, 0.5, "scrollX");
66+
assert_approx_equals(window.scrollY || window.pageYOffset, y, 0.5, "scrollY");
67+
}, "scrollIntoView(" + format_input(input) + ") starting at left,bottom");
6468

65-
test(() => {
69+
test(function() {
6670
window.scrollTo(12000, 0);
6771
testScrollIntoView(input);
68-
var x = (expectedX === "nearest") ? expectedXLeft : expectedX;
69-
var y = (expectedY === "nearest") ? expectedYBottom : expectedY;
70-
assert_approx_equals(window.scrollX, x, 0.5, 'scrollX');
71-
assert_approx_equals(window.scrollY, y, 0.5, 'scrollY');
72-
}, `scrollIntoView(${format_input(input)}) starting at right,top`);
72+
var x = expectedX === "nearest" ? expectedXLeft : expectedX;
73+
var y = expectedY === "nearest" ? expectedYBottom : expectedY;
74+
assert_approx_equals(window.scrollX || window.pageXOffset, x, 0.5, "scrollX");
75+
assert_approx_equals(window.scrollY || window.pageYOffset, y, 0.5, "scrollY");
76+
}, "scrollIntoView(" + format_input(input) + ") starting at right,top");
7377

74-
test(() => {
78+
test(function() {
7579
window.scrollTo(12000, 12000);
7680
testScrollIntoView(input);
77-
var x = (expectedX === "nearest") ? expectedXLeft : expectedX;
78-
var y = (expectedY === "nearest") ? expectedYTop : expectedY;
79-
assert_approx_equals(window.scrollX, x, 0.5, 'scrollX');
80-
assert_approx_equals(window.scrollY, y, 0.5, 'scrollY');
81-
}, `scrollIntoView(${format_input(input)}) starting at right,bottom`);
81+
var x = expectedX === "nearest" ? expectedXLeft : expectedX;
82+
var y = expectedY === "nearest" ? expectedYTop : expectedY;
83+
assert_approx_equals(window.scrollX || window.pageXOffset, x, 0.5, "scrollX");
84+
assert_approx_equals(window.scrollY || window.pageYOffset, y, 0.5, "scrollY");
85+
}, "scrollIntoView(" + format_input(input) + ") starting at right,bottom");
8286
});
8387

8488
function testScrollIntoView(input) {
@@ -93,11 +97,11 @@
9397
// format_value() is provided by testharness.js,
9498
// which also preserves sign for -0.
9599
function format_dict(dict) {
96-
const props = [];
97-
for (let prop in dict) {
98-
props.push(`${prop}: ${format_value(dict[prop])}`);
100+
var props = [];
101+
for (var prop in dict) {
102+
props.push(prop + ": " + format_value(dict[prop]));
99103
}
100-
return `{${props.join(', ')}}`;
104+
return "{" + props.join(", ") + "}";
101105
}
102106

103107
function format_input(input) {
@@ -109,6 +113,6 @@
109113
return format_dict(input);
110114
}
111115

112-
document.body.classList.remove('running');
116+
document.body.classList.remove("running");
113117
window.scrollTo(0, 0);
114118
</script>

‎tests/web-platform/custom/borders.html

+13-6
Original file line numberDiff line numberDiff line change
@@ -167,19 +167,26 @@
167167
[8, "end", "end", [{ x: 100, y: 100 }, { x: 145, y: 145 }]],
168168
[0, "nearest", "nearest", [{ x: 23, y: 23 }, { x: 0, y: 0 }]],
169169
[8, "nearest", undefined, [{ x: 100, y: 100 }, { x: 145, y: 145 }]]
170-
].forEach(([target, block, inline, [outer, inner]]) => {
171-
test(() => {
170+
].forEach(function(suite) {
171+
var target = suite[0];
172+
var block = suite[1];
173+
var inline = suite[2];
174+
var outer = suite[3][0];
175+
var inner = suite[3][1];
176+
test(function() {
172177
window.scrollTo(0, 0);
173-
outerContainer.scrollTo(0, 0);
174-
innerContainer.scrollTo(0, 0);
175-
scrollIntoView(tiles[target], {block, inline});
178+
outerContainer.scrollTop = 0
179+
outerContainer.scrollLeft = 0
180+
innerContainer.scrollTop = 0
181+
innerContainer.scrollLeft = 0
182+
scrollIntoView(tiles[target], {block: block, inline: inline});
176183
//tiles[target].scrollIntoView({block, inline});
177184

178185
assert_approx_equals(outerContainer.scrollLeft, outer.x, 1, 'outerContainer.scrollLeft');
179186
assert_approx_equals(outerContainer.scrollTop, outer.y, 1, 'outerContainer.scrollTop');
180187
assert_approx_equals(innerContainer.scrollLeft, inner.x, 1, 'innerContainer.scrollLeft');
181188
assert_approx_equals(innerContainer.scrollTop, inner.y, 1, 'innerContainer.scrollTop');
182-
}, `scrollIntoView(${JSON.stringify({block, inline})})`);
189+
}, 'scrollIntoView('+JSON.stringify({block: block, inline: inline})+')');
183190
});
184191

185192
document.body.classList.remove('running');

0 commit comments

Comments
 (0)