test/docsify
1
0
Fork 0
mirror of https://gitee.com/docsifyjs/docsify.git synced 2024-12-02 03:59:19 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix waitForText() timeout and reject messages

Browse Source
This commit is contained in:
John Hildenbiddle 2020-10-23 13:07:10 -05:00
parent 871e48f823
commit 131aae520a
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
test/helpers/wait-for.js
View File

@ -37,9 +37,11 @@ export function waitForFunction(fn, arg, options = {}) {
timeElapsed += settings.delay;
if (timeElapsed >= settings.timeout) {
reject(
`waitForFunction() did not return a truthy value\n\n${fn.toString()}\n\n`
);
const msg = `waitForFunction did not return a truthy value (${
settings.timeout
} ms): ${fn.toString()}\n`;
reject(msg);
}
}, settings.delay);
});
@ -71,9 +73,9 @@ export function waitForSelector(cssSelector, options = {}) {
timeElapsed += settings.delay;
if (timeElapsed >= settings.timeout) {
reject(
`waitForSelector() was unable to find CSS selector ${cssSelector}`
);
const msg = `waitForSelector did not match CSS selector '${cssSelector}' (${settings.timeout} ms)`;
reject(msg);
}
}, settings.delay);
});
@ -94,20 +96,31 @@ export function waitForText(cssSelector, text, options = {}) {
};
return new Promise((resolve, reject) => {
let timeElapsed = 0;
waitForSelector(cssSelector, settings)
.then(elm => {
const isMatch = elm.textContent.includes(text);
const int = setInterval(() => {
const isMatch = elm.textContent.includes(text);
if (isMatch) {
resolve(elm);
} else {
reject(
`waitForText() did not find "${text}" in CSS selector ${cssSelector}`
);
}
if (isMatch) {
clearInterval(int);
resolve(true);
}
timeElapsed += settings.delay;
if (timeElapsed >= settings.timeout) {
const msg = `waitForText did not find '${text}' in CSS selector '${cssSelector}' (${settings.timeout} ms): '${elm.textContent}'`;
reject(msg);
}
}, settings.delay);
})
.catch(() => {
reject(`waitForText() was unable to find CSS selector ${cssSelector}`);
const msg = `waitForText did not match CSS selector '${cssSelector}' (${settings.timeout} ms)`;
reject(msg);
});
});
}