Introduce a generic clearEditors helper function
This replaces the various copies of this logic with a single helper that we template for each editor type, similar to what we already do for the `switchToEditor` helper.
This commit is contained in:
parent
f155b69c07
commit
acc5a2153a
@ -15,6 +15,7 @@
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
awaitPromise,
|
awaitPromise,
|
||||||
|
clearEditors,
|
||||||
closePages,
|
closePages,
|
||||||
copy,
|
copy,
|
||||||
copyToClipboard,
|
copyToClipboard,
|
||||||
@ -59,13 +60,7 @@ import { PNG } from "pngjs";
|
|||||||
|
|
||||||
const selectAll = selectEditors.bind(null, "freeText");
|
const selectAll = selectEditors.bind(null, "freeText");
|
||||||
|
|
||||||
const clearAll = async page => {
|
const clearAll = clearEditors.bind(null, "freeText");
|
||||||
await selectAll(page);
|
|
||||||
await page.keyboard.down("Control");
|
|
||||||
await page.keyboard.press("Backspace");
|
|
||||||
await page.keyboard.up("Control");
|
|
||||||
await waitForStorageEntries(page, 0);
|
|
||||||
};
|
|
||||||
|
|
||||||
const commit = async page => {
|
const commit = async page => {
|
||||||
await page.keyboard.press("Escape");
|
await page.keyboard.press("Escape");
|
||||||
|
|||||||
@ -15,6 +15,7 @@
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
awaitPromise,
|
awaitPromise,
|
||||||
|
clearEditors,
|
||||||
closePages,
|
closePages,
|
||||||
dragAndDrop,
|
dragAndDrop,
|
||||||
getAnnotationSelector,
|
getAnnotationSelector,
|
||||||
@ -42,11 +43,7 @@ import {
|
|||||||
|
|
||||||
const selectAll = selectEditors.bind(null, "ink");
|
const selectAll = selectEditors.bind(null, "ink");
|
||||||
|
|
||||||
const clearAll = async page => {
|
const clearAll = clearEditors.bind(null, "ink");
|
||||||
await selectAll(page);
|
|
||||||
await page.keyboard.press("Backspace");
|
|
||||||
await waitForStorageEntries(page, 0);
|
|
||||||
};
|
|
||||||
|
|
||||||
const commit = async page => {
|
const commit = async page => {
|
||||||
await page.keyboard.press("Escape");
|
await page.keyboard.press("Escape");
|
||||||
|
|||||||
@ -17,6 +17,7 @@ import {
|
|||||||
applyFunctionToEditor,
|
applyFunctionToEditor,
|
||||||
awaitPromise,
|
awaitPromise,
|
||||||
cleanupEditing,
|
cleanupEditing,
|
||||||
|
clearEditors,
|
||||||
clearInput,
|
clearInput,
|
||||||
closePages,
|
closePages,
|
||||||
copy,
|
copy,
|
||||||
@ -38,7 +39,6 @@ import {
|
|||||||
pasteFromClipboard,
|
pasteFromClipboard,
|
||||||
scrollIntoView,
|
scrollIntoView,
|
||||||
selectEditor,
|
selectEditor,
|
||||||
selectEditors,
|
|
||||||
serializeBitmapDimensions,
|
serializeBitmapDimensions,
|
||||||
switchToEditor,
|
switchToEditor,
|
||||||
unselectEditor,
|
unselectEditor,
|
||||||
@ -47,7 +47,6 @@ import {
|
|||||||
waitForEntryInStorage,
|
waitForEntryInStorage,
|
||||||
waitForSelectedEditor,
|
waitForSelectedEditor,
|
||||||
waitForSerialized,
|
waitForSerialized,
|
||||||
waitForStorageEntries,
|
|
||||||
waitForTimeout,
|
waitForTimeout,
|
||||||
} from "./test_utils.mjs";
|
} from "./test_utils.mjs";
|
||||||
import { fileURLToPath } from "url";
|
import { fileURLToPath } from "url";
|
||||||
@ -57,13 +56,7 @@ import { PNG } from "pngjs";
|
|||||||
|
|
||||||
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
||||||
|
|
||||||
const selectAll = selectEditors.bind(null, "stamp");
|
const clearAll = clearEditors.bind(null, "stamp");
|
||||||
|
|
||||||
const clearAll = async page => {
|
|
||||||
await selectAll(page);
|
|
||||||
await page.keyboard.press("Backspace");
|
|
||||||
await waitForStorageEntries(page, 0);
|
|
||||||
};
|
|
||||||
|
|
||||||
const waitForImage = async (page, selector) => {
|
const waitForImage = async (page, selector) => {
|
||||||
await page.waitForSelector(`${selector} canvas`);
|
await page.waitForSelector(`${selector} canvas`);
|
||||||
|
|||||||
@ -816,6 +816,12 @@ async function selectEditors(name, page) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function clearEditors(name, page) {
|
||||||
|
await selectEditors(name, page);
|
||||||
|
await page.keyboard.press("Backspace");
|
||||||
|
await waitForStorageEntries(page, 0);
|
||||||
|
}
|
||||||
|
|
||||||
function waitForNoElement(page, selector) {
|
function waitForNoElement(page, selector) {
|
||||||
return page.waitForFunction(
|
return page.waitForFunction(
|
||||||
sel => !document.querySelector(sel),
|
sel => !document.querySelector(sel),
|
||||||
@ -888,6 +894,7 @@ export {
|
|||||||
applyFunctionToEditor,
|
applyFunctionToEditor,
|
||||||
awaitPromise,
|
awaitPromise,
|
||||||
cleanupEditing,
|
cleanupEditing,
|
||||||
|
clearEditors,
|
||||||
clearInput,
|
clearInput,
|
||||||
closePages,
|
closePages,
|
||||||
closeSinglePage,
|
closeSinglePage,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user