From 8e12d197a2211fbf9394dec83abc05c679778ab8 Mon Sep 17 00:00:00 2001
From: Joel Einbinder <joel.einbinder@gmail.com>
Date: Tue, 29 May 2018 15:30:08 -0700
Subject: [PATCH] fix(tests): normalize scrollbars in headful tests (#2622)

Scrollbars look different on different platforms, so must be made invisible in tests. As a drive-by, xdescribe was broken with the new test runner.

References #2524
---
 test/assets/frames/nested-frames.html | 3 +++
 test/assets/grid.html                 | 4 ++++
 test/elementhandle.spec.js            | 3 +++
 utils/testrunner/TestRunner.js        | 6 +++++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/test/assets/frames/nested-frames.html b/test/assets/frames/nested-frames.html
index e5fdb751feb..cb14fe6be6d 100644
--- a/test/assets/frames/nested-frames.html
+++ b/test/assets/frames/nested-frames.html
@@ -7,6 +7,9 @@ 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 c0843a8eed7..0bdbb1220e5 100644
--- a/test/assets/grid.html
+++ b/test/assets/grid.html
@@ -45,4 +45,8 @@ body {
     box-sizing: border-box;
     border: 1px solid darkgray;
 }
+
+::-webkit-scrollbar {
+    display: none;
+}
 </style>
diff --git a/test/elementhandle.spec.js b/test/elementhandle.spec.js
index 111afd7363e..aee915ed7a8 100644
--- a/test/elementhandle.spec.js
+++ b/test/elementhandle.spec.js
@@ -222,6 +222,9 @@ module.exports.addTests = function({testRunner, expect}) {
           height: 600px;
           margin-left: 50px;
         }
+        ::-webkit-scrollbar{
+          display: none;
+        }
         </style>
         <div class="to-screenshot"></div>
       `);
diff --git a/utils/testrunner/TestRunner.js b/utils/testrunner/TestRunner.js
index 34e0974efd0..a01904fd1e5 100644
--- a/utils/testrunner/TestRunner.js
+++ b/utils/testrunner/TestRunner.js
@@ -295,7 +295,11 @@ class TestRunner extends EventEmitter {
   }
 
   _addTest(mode, name, callback) {
-    const test = new Test(this._currentSuite, name, callback, mode, this._timeout);
+    let suite = this._currentSuite;
+    let isSkipped = suite.declaredMode === TestMode.Skip;
+    while ((suite = suite.parentSuite))
+      isSkipped |= suite.declaredMode === TestMode.Skip;
+    const test = new Test(this._currentSuite, name, callback, isSkipped ? TestMode.Skip : mode, this._timeout);
     this._currentSuite.children.push(test);
     this._tests.push(test);
     this._hasFocusedTestsOrSuites = this._hasFocusedTestsOrSuites || mode === TestMode.Focus;