From 8220ab137908c7d1887fdbb8c4858b71321b8ce6 Mon Sep 17 00:00:00 2001
From: Dmitry Gozman <dgozman@gmail.com>
Date: Wed, 29 Jun 2022 03:04:46 -0700
Subject: [PATCH] feat(firefox): roll ff 1328 and ff-beta 1330 (#15185)

---
 packages/playwright-core/browsers.json                    | 4 ++--
 packages/playwright-core/src/server/firefox/protocol.d.ts | 4 ++--
 tests/page/page-accessibility.spec.ts                     | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/playwright-core/browsers.json b/packages/playwright-core/browsers.json
index 669eb30db7..9d7b8f9957 100644
--- a/packages/playwright-core/browsers.json
+++ b/packages/playwright-core/browsers.json
@@ -21,13 +21,13 @@
     },
     {
       "name": "firefox",
-      "revision": "1327",
+      "revision": "1328",
       "installByDefault": true,
       "browserVersion": "100.0.2"
     },
     {
       "name": "firefox-beta",
-      "revision": "1329",
+      "revision": "1330",
       "installByDefault": false,
       "browserVersion": "101.0b8"
     },
diff --git a/packages/playwright-core/src/server/firefox/protocol.d.ts b/packages/playwright-core/src/server/firefox/protocol.d.ts
index f541579967..7953b451f9 100644
--- a/packages/playwright-core/src/server/firefox/protocol.d.ts
+++ b/packages/playwright-core/src/server/firefox/protocol.d.ts
@@ -972,7 +972,7 @@ export module Protocol {
       focused?: boolean;
       pressed?: boolean;
       focusable?: boolean;
-      haspopup?: boolean;
+      haspopup?: string;
       required?: boolean;
       invalid?: boolean;
       modal?: boolean;
@@ -1007,7 +1007,7 @@ export module Protocol {
         focused?: boolean;
         pressed?: boolean;
         focusable?: boolean;
-        haspopup?: boolean;
+        haspopup?: string;
         required?: boolean;
         invalid?: boolean;
         modal?: boolean;
diff --git a/tests/page/page-accessibility.spec.ts b/tests/page/page-accessibility.spec.ts
index aa1f3e3c43..203aadb3b0 100644
--- a/tests/page/page-accessibility.spec.ts
+++ b/tests/page/page-accessibility.spec.ts
@@ -102,9 +102,10 @@ it('orientation', async ({ page }) => {
 });
 
 it('autocomplete', async ({ page }) => {
-  await page.setContent('<div role="textbox" aria-autocomplete="list">hi</div>');
+  await page.setContent('<div role="textbox" aria-autocomplete="list" aria-haspopup="menu">hi</div>');
   const snapshot = await page.accessibility.snapshot();
   expect(snapshot.children[0].autocomplete).toEqual('list');
+  expect(snapshot.children[0].haspopup).toEqual('menu');
 });
 
 it('multiselectable', async ({ page }) => {