feat(firefox): roll Firefox to 1387

Fixes microsoft#21109 Fixes microsoft#21430
aslushnikov · Mar 10, 2023 · e0eb465 · e0eb465
1 parent a619ea4
commit e0eb465
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 20 deletions.
diff --git a/packages/playwright-core/browsers.json b/packages/playwright-core/browsers.json
@@ -21,13 +21,13 @@
     },
     {
       "name": "firefox",
-      "revision": "1384",
+      "revision": "1387",
       "installByDefault": true,
       "browserVersion": "109.0"
     },
     {
       "name": "firefox-beta",
-      "revision": "1386",
+      "revision": "1389",
       "installByDefault": false,
       "browserVersion": "110.0b7"
     },

diff --git a/packages/playwright-core/src/server/firefox/ffPage.ts b/packages/playwright-core/src/server/firefox/ffPage.ts
@@ -393,20 +393,7 @@ export class FFPage implements PageDelegate {
   }
 
   async reload(): Promise<void> {
-    const mainFrame = this._page._frameManager.mainFrame();
-    // This is a workaround for https://github.com/microsoft/playwright/issues/21145
-    let hash = '';
-    try {
-      hash = (new URL(mainFrame.url())).hash;
-    } catch (e) {
-      // Ignore URL parsing error, if any.
-    }
-    if (hash.length) {
-      const context = await mainFrame._utilityContext();
-      await context.rawEvaluateJSON(`void window.location.reload();`);
-    } else {
-      await this._session.send('Page.reload');
-    }
+    await this._session.send('Page.reload');
   }
 
   async goBack(): Promise<boolean> {

diff --git a/tests/page/page-evaluate.spec.ts b/tests/page/page-evaluate.spec.ts
@@ -703,9 +703,8 @@ it('should work with overridden globalThis.Window/Document/Node', async ({ page,
   }
 });
 
-it('should work with overridden URL/Date/RegExp', async ({ page, server, browserName }) => {
+it('should work with overridden URL/Date/RegExp', async ({ page, server }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/21109' });
-  it.fixme(browserName === 'firefox');
   const testCases = [
     // @ts-ignore
     () => globalThis.URL = 'foo',

diff --git a/tests/page/page-history.spec.ts b/tests/page/page-history.spec.ts
@@ -192,9 +192,8 @@ it('page.reload should work on a page with a hash', async ({ page, server }) =>
   await expect(page).toHaveURL(server.EMPTY_PAGE + '#hash');
 });
 
-it('page.reload should work on a page with a hash at the end', async ({ page, server, browserName }) => {
+it('page.reload should work on a page with a hash at the end', async ({ page, server }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/21430' });
-  it.fixme(browserName === 'firefox');
   await page.goto(server.EMPTY_PAGE + '#');
   await page.reload();
   await expect(page).toHaveURL(server.EMPTY_PAGE + '#');