@guidepup/playwright 0.16.1 → 0.16.3

package/lib/nvdaTest.js

@@ -14,9 +14,19 @@ const MOVE_TO_TOP = {
     keyCode: [guidepup_1.WindowsKeyCodes.Home],
     modifiers: [guidepup_1.WindowsModifiers.Control],
 };
+const cleanString = (str) => str
+    .toLowerCase()
+    // REF: https://github.com/nvaccess/nvda/blob/master/source/locale/en/symbols.dic
+    .replace(/[|¦:;'"`\-‐–—·_()[\]{}\\^~]/g, " ")
+    .replace(/\s+/g, " ")
+    .trim();
 const hasFocus = ({ applicationName, pageTitle, windowTitle, }) => {
-    return ((pageTitle.length && windowTitle.startsWith(pageTitle)) ||
-        windowTitle.includes(applicationName));
+    const cleanedApplicationName = cleanString(applicationName);
+    const cleanedPageTitle = cleanString(pageTitle);
+    const cleanedWindowTitle = cleanString(windowTitle);
+    return ((cleanedPageTitle.length &&
+        cleanedWindowTitle.startsWith(cleanedPageTitle)) ||
+        cleanedWindowTitle.includes(cleanedApplicationName));
 };
 const focusBrowser = async ({ applicationName, pageTitle, }) => {
     await nvdaPlaywright.perform(nvdaPlaywright.keyboardCommands.reportTitle);
@@ -56,7 +66,10 @@ exports.nvdaTest = test_1.test.extend({
                 await nvdaPlaywright.perform(nvdaPlaywright.keyboardCommands.exitFocusMode);
                 const pageTitle = await page.title();
                 // Ensure application is brought to front and focused.
-                await focusBrowser({ applicationName, pageTitle });
+                await focusBrowser({
+                    applicationName,
+                    pageTitle,
+                });
                 // Ensure the document is ready and focused.
                 await page.bringToFront();
                 await page.locator("body").waitFor();

package/lib/voiceOverTest.js

@@ -27,11 +27,11 @@ exports.voiceOverTest = test_1.test.extend({
                 // Ensure the document is ready and focused.
                 await page.bringToFront();
                 await page.locator("body").waitFor();
-                // Open the web item rotor defaulting to window spots.
-                await voiceOverPlaywright.perform(voiceOverPlaywright.keyboardCommands.openWebItemRotor);
-                // Filter by "content" - currently web content spots for all browsers
-                // are prefixed by "Content -".
-                await voiceOverPlaywright.type("content");
+                // Open the web item chooser.
+                await voiceOverPlaywright.perform(voiceOverPlaywright.keyboardCommands.openItemChooser);
+                // Filter by "web content" - currently web content items for all browsers
+                // are suffixed by "web content".
+                await voiceOverPlaywright.type("web content");
                 // Select the web content window spot.
                 await voiceOverPlaywright.perform({ keyCode: guidepup_1.MacOSKeyCodes.Enter });
                 // Navigate into web content.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@guidepup/playwright",
-  "version": "0.16.1",
-  "description": "Screen reader driver for Playwright tests.",
+  "version": "0.16.3",
+  "description": "Screen reader automation library for Playwright testing. ",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "author": "Craig Morten <craig.morten@hotmail.co.uk>",