Bug 951793 - Update the manual web-platform-test to reflect the name change from scroll-boundary-behavior for overscroll-behavior. r=kats,jgraham
MozReview-Commit-ID: 8oKvmzdzF30
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -11594,19 +11594,19 @@
]
],
"css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1.html": [
[
"/css/vendor-imports/mozilla/mozilla-central-reftests/multicol3/moz-multicol3-column-balancing-break-inside-avoid-1.html",
{}
]
],
- "cssom-view/scrollBoundaryBehavior-manual.html": [
- [
- "/cssom-view/scrollBoundaryBehavior-manual.html",
+ "cssom-view/overscrollBehavior-manual.html": [
+ [
+ "/cssom-view/overscrollBehavior-manual.html",
{}
]
],
"dpub-aam/doc-abstract-manual.html": [
[
"/dpub-aam/doc-abstract-manual.html",
{}
]
@@ -532974,17 +532974,17 @@
"cssom-view/resources/iframe1.html": [
"ec93f617bdc7b0055d96c7b00ab7832cca1c1af0",
"support"
],
"cssom-view/resources/iframe2.html": [
"0a8784c474ccdd4a3e76cb936855a8ef59566217",
"support"
],
- "cssom-view/scrollBoundaryBehavior-manual.html": [
+ "cssom-view/overscrollBehavior-manual.html": [
"987051cdbad355cbb1bbb8ea1030a3b17e533f09",
"manual"
],
"cssom-view/scrollIntoView-shadow.html": [
"3c4a18992105fd7bf19cbf29f0b6d80cb12ca98c",
"testharness"
],
"cssom-view/scrollIntoView-smooth.html": [
rename from testing/web-platform/tests/cssom-view/scrollBoundaryBehavior-manual.html
rename to testing/web-platform/tests/cssom-view/overscrollBehavior-manual.html
--- a/testing/web-platform/tests/cssom-view/scrollBoundaryBehavior-manual.html
+++ b/testing/web-platform/tests/cssom-view/overscrollBehavior-manual.html
@@ -36,31 +36,31 @@
<div id='non_scrollable' class='outer'>
<div id='green' class='content'></div>
</div>
<div id='container' class='outer'>
<div id='blue' class='content'></div>
</div>
</div>
<input type="button" id="btnDone" value="DONE" style="width: 100px; height: 50px;"/>
-<h1>scroll-boundary-behavior</h1>
-<h4>Tests that scroll-boundary-behavior prevents scroll-propagation in the area and direction as specified.</h4>
+<h1>overscroll-behavior</h1>
+<h4>Tests that overscroll-behavior prevents scroll-propagation in the area and direction as specified.</h4>
<ol>
<li id="i1">Make two scrolls on <span style="color: blue">BLUE</span>, in this order: scroll UP (or drag down), then scroll LEFT (or drag right). Scroll (or drag) until nothing is scrolling. Then tap on DONE.</li>
<li id="i2">Repeat the same scrolls as in step 1 and then tap on DONE.</li>
<li id="i3">Repeat the same scrolls as in step 1 and then tap on DONE.</li>
<li id="i4">Make two separate scrolls on <span style="color: green">GREEN</span>, in this order: scroll UP (or drag down), then scroll LEFT (or drag right). Scroll (or drag) until nothing is scrolling. Then tap on DONE.</li>
</ol>
<script>
const container = document.getElementById('container');
const non_scrollable = document.getElementById('non_scrollable');
const root = document.getElementById('root');
-var test = async_test("scroll-boundary-behavior prevents scroll-propagation in the area and direction as specified");
+var test = async_test("overscroll-behavior prevents scroll-propagation in the area and direction as specified");
var instruction1 = document.getElementById("i1");
var instruction2 = document.getElementById("i2");
var instruction3 = document.getElementById("i3");
var instruction4 = document.getElementById("i4");
function setUpForRoot(offset) {
root.scrollTop = offset;
root.scrollLeft = offset;
@@ -69,72 +69,72 @@ function setUpForRoot(offset) {
function setUpForContainer(offset) {
container.scrollTop = offset;
container.scrollLeft = offset
}
function set_boundary_prevents_y() {
instruction1.style.color = 'red';
instruction1.style.fontWeight = 'bold';
- container.style.scrollBoundaryBehaviorX = 'auto';
- container.style.scrollBoundaryBehaviorY = 'none';
+ container.style.overscrollBehaviorX = 'auto';
+ container.style.overscrollBehaviorY = 'none';
setUpForRoot(100);
setUpForContainer(0);
}
function verify_y_prevented_and_set_boundary_prevents_x() {
instruction1.style.fontWeight = 'normal';
instruction2.style.fontWeight = 'bold';
test.step(function() {
assert_equals(root.scrollTop, 100);
assert_equals(root.scrollLeft, 0);
- }, "scroll-boundary-behavior-y: none should only prevent scroll propagation on y axis.");
+ }, "overscroll-behavior-y: none should only prevent scroll propagation on y axis.");
- container.style.scrollBoundaryBehaviorX = 'none';
- container.style.scrollBoundaryBehaviorY = 'auto';
+ container.style.overscrollBehaviorX = 'none';
+ container.style.overscrollBehaviorY = 'auto';
setUpForRoot(100);
setUpForContainer(0);
}
function verify_x_prevented_and_set_boundary_allows_inner() {
instruction2.style.fontWeight = 'normal';
instruction3.style.fontWeight = 'bold';
test.step(function() {
assert_equals(root.scrollTop, 0);
assert_equals(root.scrollLeft, 100);
- }, "scroll-boundary-behavior-x: none should only prevent scroll propagation on x axis.");
+ }, "overscroll-behavior-x: none should only prevent scroll propagation on x axis.");
- container.style.scrollBoundaryBehaviorX = 'none';
- container.style.scrollBoundaryBehaviorY = 'none';
+ container.style.overscrollBehaviorX = 'none';
+ container.style.overscrollBehaviorY = 'none';
setUpForRoot(100);
setUpForContainer(100);
}
function verify_inner_allowed_and_set_nonscrollable_allows_propagation() {
instruction1.style.color = 'black';
instruction4.style.color = 'red';
instruction3.style.fontWeight = 'normal';
instruction4.style.fontWeight = 'bold';
test.step(function() {
assert_equals(container.scrollTop, 0);
assert_equals(container.scrollLeft, 0);
assert_equals(root.scrollTop, 100);
assert_equals(root.scrollLeft, 100);
- }, "scroll-boundary-behavior should latch the scroll to the inner container.");
+ }, "overscroll-behavior should latch the scroll to the inner container.");
- non_scrollable.style.scrollBoundaryBehaviorX = 'none';
- non_scrollable.style.scrollBoundaryBehaviorY = 'none';
+ non_scrollable.style.overscrollBehaviorX = 'none';
+ non_scrollable.style.overscrollBehaviorY = 'none';
setUpForRoot(100);
}
function verify_non_scrollable_allows_propagation() {
test.step(function() {
assert_equals(root.scrollLeft, 0);
assert_equals(root.scrollTop, 0);
- }, "scroll-boundary-behavior on non-scrollable area should not affect scroll propagation.");
+ }, "overscroll-behavior on non-scrollable area should not affect scroll propagation.");
test.done();
}
var verifyAndSetupForNext = [
set_boundary_prevents_y,
verify_y_prevented_and_set_boundary_prevents_x,
verify_x_prevented_and_set_boundary_allows_inner,
verify_inner_allowed_and_set_nonscrollable_allows_propagation,