From 197f00547ea402118c7db3cfaa4a57eb0efdd4cc Mon Sep 17 00:00:00 2001
From: Henrik Skupin <mail@hskupin.info>
Date: Fri, 2 Feb 2024 17:25:17 +0100
Subject: [PATCH] test: replace usages of webkit-scrollbar with scrollbar-width
 (#11825)

---
 test/TestExpectations.json            | 66 ---------------------------
 test/assets/frames/nested-frames.html |  7 +--
 test/assets/grid.html                 |  9 ++--
 test/src/screenshot.spec.ts           |  6 +--
 4 files changed, 11 insertions(+), 77 deletions(-)

diff --git a/test/TestExpectations.json b/test/TestExpectations.json
index fd2c64cdbb8..c2c819add0e 100644
--- a/test/TestExpectations.json
+++ b/test/TestExpectations.json
@@ -3376,12 +3376,6 @@
     "parameters": ["cdp", "firefox"],
     "expectations": ["FAIL", "PASS"]
   },
-  {
-    "testIdPattern": "[screenshot.spec] Screenshots ElementHandle.screenshot should capture full element when larger than viewport",
-    "platforms": ["win32"],
-    "parameters": ["cdp", "firefox"],
-    "expectations": ["FAIL"]
-  },
   {
     "testIdPattern": "[screenshot.spec] Screenshots ElementHandle.screenshot should work for an element with an offset",
     "platforms": ["darwin", "linux", "win32"],
@@ -3412,66 +3406,12 @@
     "parameters": ["cdp", "firefox"],
     "expectations": ["FAIL", "PASS"]
   },
-  {
-    "testIdPattern": "[screenshot.spec] Screenshots Page.screenshot should clip rect",
-    "platforms": ["darwin", "linux", "win32"],
-    "parameters": ["firefox", "webDriverBiDi"],
-    "expectations": ["FAIL"]
-  },
-  {
-    "testIdPattern": "[screenshot.spec] Screenshots Page.screenshot should clip rect",
-    "platforms": ["darwin", "linux", "win32"],
-    "parameters": ["cdp", "firefox"],
-    "expectations": ["FAIL", "PASS"]
-  },
-  {
-    "testIdPattern": "[screenshot.spec] Screenshots Page.screenshot should return base64",
-    "platforms": ["darwin", "linux", "win32"],
-    "parameters": ["firefox", "webDriverBiDi"],
-    "expectations": ["FAIL"]
-  },
-  {
-    "testIdPattern": "[screenshot.spec] Screenshots Page.screenshot should return base64",
-    "platforms": ["darwin", "linux", "win32"],
-    "parameters": ["cdp", "firefox"],
-    "expectations": ["FAIL", "PASS"]
-  },
   {
     "testIdPattern": "[screenshot.spec] Screenshots Page.screenshot should take fullPage screenshots",
     "platforms": ["darwin", "linux", "win32"],
     "parameters": ["cdp", "firefox"],
     "expectations": ["FAIL"]
   },
-  {
-    "testIdPattern": "[screenshot.spec] Screenshots Page.screenshot should take fullPage screenshots",
-    "platforms": ["darwin", "linux", "win32"],
-    "parameters": ["firefox", "webDriverBiDi"],
-    "expectations": ["FAIL"]
-  },
-  {
-    "testIdPattern": "[screenshot.spec] Screenshots Page.screenshot should take fullPage screenshots without captureBeyondViewport",
-    "platforms": ["darwin", "linux", "win32"],
-    "parameters": ["firefox", "webDriverBiDi"],
-    "expectations": ["FAIL"]
-  },
-  {
-    "testIdPattern": "[screenshot.spec] Screenshots Page.screenshot should take fullPage screenshots without captureBeyondViewport",
-    "platforms": ["darwin", "linux", "win32"],
-    "parameters": ["cdp", "firefox"],
-    "expectations": ["FAIL", "PASS"]
-  },
-  {
-    "testIdPattern": "[screenshot.spec] Screenshots Page.screenshot should work",
-    "platforms": ["darwin", "linux", "win32"],
-    "parameters": ["firefox", "webDriverBiDi"],
-    "expectations": ["FAIL"]
-  },
-  {
-    "testIdPattern": "[screenshot.spec] Screenshots Page.screenshot should work",
-    "platforms": ["darwin", "linux", "win32"],
-    "parameters": ["cdp", "firefox"],
-    "expectations": ["FAIL", "PASS"]
-  },
   {
     "testIdPattern": "[stacktrace.spec] Stack trace should work for none error objects",
     "platforms": ["darwin", "linux", "win32"],
@@ -3842,12 +3782,6 @@
     "parameters": ["cdp", "chrome", "headful"],
     "expectations": ["FAIL", "PASS"]
   },
-  {
-    "testIdPattern": "[screenshot.spec] Screenshots ElementHandle.screenshot should capture full element when larger than viewport",
-    "platforms": ["darwin", "win32"],
-    "parameters": ["firefox", "headless", "webDriverBiDi"],
-    "expectations": ["FAIL"]
-  },
   {
     "testIdPattern": "[screenshot.spec] Screenshots ElementHandle.screenshot should work for an element with an offset",
     "platforms": ["darwin", "linux", "win32"],
diff --git a/test/assets/frames/nested-frames.html b/test/assets/frames/nested-frames.html
index de1987586ff..e9c5d83c031 100644
--- a/test/assets/frames/nested-frames.html
+++ b/test/assets/frames/nested-frames.html
@@ -1,4 +1,8 @@
 <style>
+:root {
+  scrollbar-width: none;
+}
+
 body {
     display: flex;
 }
@@ -7,9 +11,6 @@ body iframe {
     flex-grow: 1;
     flex-shrink: 1;
 }
-::-webkit-scrollbar{
-    display: none;
-}
 </style>
 <script>
 async function attachFrame(frameId, url) {
diff --git a/test/assets/grid.html b/test/assets/grid.html
index 0bdbb1220e5..437193573d7 100644
--- a/test/assets/grid.html
+++ b/test/assets/grid.html
@@ -28,6 +28,10 @@ document.addEventListener('DOMContentLoaded', function() {
 
 <style>
 
+:root {
+  scrollbar-width: none;
+}
+
 body {
     margin: 0;
     padding: 0;
@@ -45,8 +49,3 @@ body {
     box-sizing: border-box;
     border: 1px solid darkgray;
 }
-
-::-webkit-scrollbar {
-    display: none;
-}
-</style>
diff --git a/test/src/screenshot.spec.ts b/test/src/screenshot.spec.ts
index b67028bdd33..05bfd990691 100644
--- a/test/src/screenshot.spec.ts
+++ b/test/src/screenshot.spec.ts
@@ -232,15 +232,15 @@ describe('Screenshots', function () {
       await page.setContent(`
           something above
           <style>
+          :root {
+            scrollbar-width: none;
+          }
           div.to-screenshot {
             border: 1px solid blue;
             width: 600px;
             height: 600px;
             margin-left: 50px;
           }
-          ::-webkit-scrollbar{
-            display: none;
-          }
           </style>
           <div class="to-screenshot"></div>
         `);