From 165ab9bfa958c0fbc0d9d8c0f911eadf9e4c40fb Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Wed, 3 Aug 2022 14:51:11 -0700
Subject: [PATCH] test: update macos 12 test expectations (#16223)

---
 tests/library/modernizr.spec.ts    | 11 +++++++++--
 tests/page/page-screenshot.spec.ts |  3 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/library/modernizr.spec.ts b/tests/library/modernizr.spec.ts
index 59a80ef085..62547e19cd 100644
--- a/tests/library/modernizr.spec.ts
+++ b/tests/library/modernizr.spec.ts
@@ -30,7 +30,7 @@ async function checkFeatures(name: string, context: any, server: any) {
   }
 }
 
-it('safari-14-1', async ({ browser, browserName, platform, server, headless }) => {
+it('safari-14-1', async ({ browser, browserName, platform, server, headless, isMac }) => {
   it.skip(browserName !== 'webkit');
   it.skip(browserName === 'webkit' && parseInt(os.release(), 10) < 20, 'WebKit for macOS 10.15 is frozen.');
   const context = await browser.newContext({
@@ -70,10 +70,14 @@ it('safari-14-1', async ({ browser, browserName, platform, server, headless }) =
     expected.inputtypes['datetime-local'] = false;
     expected.inputtypes.time = false;
   }
+
+  if (isMac && parseInt(os.release(), 10) > 20)
+    expected.applicationcache = false;
+
   expect(actual).toEqual(expected);
 });
 
-it('mobile-safari-14-1', async ({ playwright, browser, browserName, platform, server, headless }) => {
+it('mobile-safari-14-1', async ({ playwright, browser, browserName, platform, isMac, server, headless }) => {
   it.skip(browserName !== 'webkit');
   it.skip(browserName === 'webkit' && parseInt(os.release(), 10) < 20, 'WebKit for macOS 10.15 is frozen.');
   const iPhone = playwright.devices['iPhone 12'];
@@ -125,6 +129,9 @@ it('mobile-safari-14-1', async ({ playwright, browser, browserName, platform, se
     expected.inputtypes.time = false;
   }
 
+  if (isMac && parseInt(os.release(), 10) > 20)
+    expected.applicationcache = false;
+
   expect(actual).toEqual(expected);
 });
 
diff --git a/tests/page/page-screenshot.spec.ts b/tests/page/page-screenshot.spec.ts
index af2ef28e10..cd34650957 100644
--- a/tests/page/page-screenshot.spec.ts
+++ b/tests/page/page-screenshot.spec.ts
@@ -20,7 +20,6 @@ import { verifyViewport, attachFrame } from '../config/utils';
 import type { Route } from 'playwright-core';
 import path from 'path';
 import fs from 'fs';
-import os from 'os';
 
 it.describe('page screenshot', () => {
   it.skip(({ browserName, headless }) => browserName === 'firefox' && !headless, 'Firefox headed produces a different image.');
@@ -231,7 +230,7 @@ it.describe('page screenshot', () => {
   });
 
   it('should capture canvas changes', async ({ page, isElectron, browserName, isMac }) => {
-    it.fixme(browserName === 'webkit' && isMac && parseInt(os.release(), 10) < 21, 'https://github.com/microsoft/playwright/issues/8796,https://github.com/microsoft/playwright/issues/16180');
+    it.fixme(browserName === 'webkit' && isMac, 'https://github.com/microsoft/playwright/issues/8796,https://github.com/microsoft/playwright/issues/16180');
     it.skip(isElectron);
     await page.goto('data:text/html,<canvas></canvas>');
     await page.evaluate(() => {