Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: test/wrappers/pages.js

Issue 29938555: Noissue - Upgrade to selenium-webdriver 4.0.0-alpha (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Renamed loc to rect Created Nov. 9, 2018, 10:26 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « test/browsers/firefox.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/wrappers/pages.js
===================================================================
--- a/test/wrappers/pages.js
+++ b/test/wrappers/pages.js
@@ -23,6 +23,8 @@
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)
@@ -63,23 +65,22 @@
// 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(([rect]) =>
+ element.getDriver().executeScript(`
+ window.scrollTo(${rect.x}, ${rect.y});
+ return [window.scrollX, window.scrollY];
+ `).then(result =>
+ {
+ let x = rect.x - result[0];
+ let y = rect.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, rect.width, rect.height));
+ })
+ )
).then(img => img.bitmap);
}
« no previous file with comments | « test/browsers/firefox.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld