Noissue - Upgrade to selenium-webdriver 4.0.0-alpha

test/wrappers/pages.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 const TEST_PAGES_URL = "https://testpages.adblockplus.org/en/";
 
 const assert = require("assert");
 const Jimp = require("jimp");
 const {By, until} = require("selenium-webdriver");
 
+let lastScreenshot = Promise.resolve();
+
 // Once we require Node.js >= 10 this should be replaced with
 // the built-in finally() method of the Promise object.
 function promiseFinally(p, callback)
 {
   return p.then(
     callback,
     err => Promise.resolve(callback()).then(() =>
       Promise.reject(err)
     )
   );
@@ skipping 20 matching lines @@
 function takeScreenshot(element)
 {
   return element.takeScreenshot().then(
     imageFromBase64,
 
     // Chrome doesn't support taking screenshots of individual elements. So as
     // a workaround, we scroll to the position of the element, take a screenshot
     // of the viewport and crop it to the size and position of our element.
     // This is not guaranteed to work on other browsers (mostly because
     // the behavior of Driver.takeScreenshot() may vary across browsers).
-    () => element.getLocation().then(loc =>
-      element.getDriver().executeScript(`
-        window.scrollTo(${loc.x}, ${loc.y});
-        return [window.scrollX, window.scrollY];
-      `).then(result =>
-      {
-        let x = loc.x - result[0];
-        let y = loc.y - result[1];
+    () =>
+      lastScreenshot = Promise.all([element.getRect(),
+                                    lastScreenshot]).then(([loc]) =>

[hub, 2018/11/09 22:23:31]

you might have taken the wrong version of the patch to rebase on, as this was
supposed to be `rect` instead of `loc` (as per your suggestion in the review)

[Sebastian Noack, 2018/11/09 22:26:53]

Oops, I indeed missed your last patch set. Fixed.

+        element.getDriver().executeScript(`
+          window.scrollTo(${loc.x}, ${loc.y});
+          return [window.scrollX, window.scrollY];
+        `).then(result =>
+        {
+          let x = loc.x - result[0];
+          let y = loc.y - result[1];
 
-        return Promise.all([
-          element.getDriver().takeScreenshot().then(imageFromBase64),
-          element.getSize()
-        ]).then(([img, size]) =>
-          img.crop(x, y, size.width, size.height)
-        );
-      })
-    )
+          return element.getDriver().takeScreenshot()
+            .then(imageFromBase64)
+            .then(img => img.crop(x, y, loc.width, loc.height));
+        })
+      )
   ).then(img => img.bitmap);
 }
 
 function getSections(driver)
 {
   return driver.findElements(By.css("section")).then(elements =>
     Promise.all(elements.map(e =>
       Promise.all([
         e.findElement(By.css("h2")).catch(() => null),
         e.findElement(By.className("testcase-container")).catch(() => null),
@@ skipping 153 matching lines @@
         `)
       ).then(([added, err]) =>
       {
         if (err)
           throw err;
         assert.ok(added, "subscription added");
       })
     )
   );
 });