test: wait until the page shows a screen, not only until it lays out (closes #502)
The browser suites' wait for a screen passed as soon as the element laid out. Until the page's stylesheet has applied, every view lays out, so an approval test could read the prompt before the page's script had filled it. visible() in the Chrome harness and waitVisible() in the Firefox driver now also wait for the page to finish loading and for neither the element nor anything around it to carry the hidden class that showView() keeps on every view but the current one. Both also require the element's computed visibility to be visible, as the browser library's own check in Chrome did. No caller changed. Model: opus-5-5
This commit was merged in pull request #504.
This commit is contained in:
@@ -279,12 +279,18 @@ class Driver {
|
||||
|
||||
// Shown means shown: in the popup a view is switched by toggling a
|
||||
// "hidden" class, and an element that is present but collapsed is not
|
||||
// the thing a test means by visible.
|
||||
// the thing a test means by visible. Until the page's stylesheet has
|
||||
// applied that class hides nothing and every view lays out, so the page
|
||||
// must also have finished loading, which it does only after its
|
||||
// stylesheet, and neither the element nor anything enclosing it may
|
||||
// carry the class (https://git.eeqj.de/sneak/AutistMask/issues/502).
|
||||
async waitVisible(selector, timeout = DEFAULT_WAIT_MS) {
|
||||
return this.waitFor(
|
||||
"selector " + selector + " to be visible",
|
||||
`const el = document.querySelector(arguments[0]);
|
||||
if (!el) return false;
|
||||
if (document.readyState !== "complete" || !el) return false;
|
||||
if (el.closest(".hidden")) return false;
|
||||
if (getComputedStyle(el).visibility !== "visible") return false;
|
||||
const r = el.getBoundingClientRect();
|
||||
return r.width > 0 && r.height > 0;`,
|
||||
[selector],
|
||||
|
||||
+26
-1
@@ -333,8 +333,33 @@ async function launch(routeOpts) {
|
||||
|
||||
const PASSWORD = "e2e-harness-password";
|
||||
|
||||
// Waits until the page shows `selector`, not only until it lays out. Until the
|
||||
// page's stylesheet has applied, the `hidden` class that showView() keeps on
|
||||
// every view but the current one hides nothing and every view lays out, so a
|
||||
// test could read a screen before the page's script had filled it
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/502). So the page must also
|
||||
// have finished loading, which it does only after its stylesheet, and neither
|
||||
// the element nor anything enclosing it may carry `hidden`. Polled on a timer:
|
||||
// animation frames are not guaranteed to a window that is not in front.
|
||||
async function visible(page, selector, timeout = 15000) {
|
||||
await page.waitForSelector(selector, { state: "visible", timeout });
|
||||
await page
|
||||
.waitForFunction(
|
||||
(sel) => {
|
||||
const el = document.querySelector(sel);
|
||||
if (document.readyState !== "complete" || !el) return false;
|
||||
if (el.closest(".hidden")) return false;
|
||||
if (getComputedStyle(el).visibility !== "visible") return false;
|
||||
const r = el.getBoundingClientRect();
|
||||
return r.width > 0 && r.height > 0;
|
||||
},
|
||||
selector,
|
||||
{ polling: 50, timeout },
|
||||
)
|
||||
.catch((e) => {
|
||||
throw new Error(
|
||||
"the page did not show " + selector + ": " + e.message,
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
// An empty WebAssembly module: magic number and version header, no
|
||||
|
||||
Reference in New Issue
Block a user