From 62cc05ee4336075c93eb04ad234bca8d0a745f3b Mon Sep 17 00:00:00 2001
From: Andy Earnshaw <andy.earnshaw@gmail.com>
Date: Fri, 5 Nov 2021 15:07:15 +0000
Subject: [PATCH] fix(ariaqueryhandler): allow single quotes in aria attribute
 selector

This updates the regular expression used to parse aria attribute
selectors so that single quotes may be used as an alternative to double
quotes, e.g. `aria/Single button[role='button']`.

Issues: #7721
---
 src/common/AriaQueryHandler.ts | 4 ++--
 test/ariaqueryhandler.spec.ts  | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/common/AriaQueryHandler.ts b/src/common/AriaQueryHandler.ts
index 9e9c69a0cedf0..cb3fd341dcde6 100644
--- a/src/common/AriaQueryHandler.ts
+++ b/src/common/AriaQueryHandler.ts
@@ -41,7 +41,7 @@ const normalizeValue = (value: string): string =>
   value.replace(/ +/g, ' ').trim();
 const knownAttributes = new Set(['name', 'role']);
 const attributeRegexp =
-  /\[\s*(?<attribute>\w+)\s*=\s*"(?<value>\\.|[^"\\]*)"\s*\]/g;
+  /\[\s*(?<attribute>\w+)\s*=\s*(?<quote>"|')(?<value>\\.|.*?(?=\k<quote>))\k<quote>\s*\]/g;
 
 /*
  * The selectors consist of an accessible name to query for and optionally
@@ -58,7 +58,7 @@ function parseAriaSelector(selector: string): ariaQueryOption {
   const queryOptions: ariaQueryOption = {};
   const defaultName = selector.replace(
     attributeRegexp,
-    (_, attribute: string, value: string) => {
+    (_, attribute: string, quote: string, value: string) => {
       attribute = attribute.trim();
       if (!knownAttributes.has(attribute))
         throw new Error(`Unknown aria attribute "${attribute}" in selector`);
diff --git a/test/ariaqueryhandler.spec.ts b/test/ariaqueryhandler.spec.ts
index 395978bc09553..2773520853716 100644
--- a/test/ariaqueryhandler.spec.ts
+++ b/test/ariaqueryhandler.spec.ts
@@ -46,6 +46,10 @@ describeChromeOnly('AriaQueryHandler', () => {
         'aria/Submit button and some spaces[role="button"]'
       );
       await expectFound(button);
+      button = await page.$(
+        "aria/Submit button and some spaces[role='button']"
+      );
+      await expectFound(button);
       button = await page.$(
         'aria/  Submit button and some spaces[role="button"]'
       );
@@ -70,6 +74,10 @@ describeChromeOnly('AriaQueryHandler', () => {
         'aria/[name="  Submit  button and some  spaces"][role="button"]'
       );
       await expectFound(button);
+      button = await page.$(
+        "aria/[name='  Submit  button and some  spaces'][role='button']"
+      );
+      await expectFound(button);
       button = await page.$(
         'aria/ignored[name="Submit  button and some  spaces"][role="button"]'
       );