Bug 1319237 - Make GeckoDriver#setWindowSize synchronous; r?automatedtester draft
authorAndreas Tolfsen <ato@mozilla.com>
Mon, 21 Nov 2016 23:44:22 +0100
changeset 479404 3702b5e40907b01f7f204637ff387758efec71df
parent 479403 d2632d17e9b1ba8ddae7ad77bc7c5ccfc33c0681
child 479405 5cdeb888122380dac9a2601c32ef42d45108a7d7
push id44243
push userbmo:ato@mozilla.com
push dateMon, 06 Feb 2017 16:11:43 +0000
reviewersautomatedtester
bugs1319237
milestone54.0a1
Bug 1319237 - Make GeckoDriver#setWindowSize synchronous; r?automatedtester Return from the Set Window Size command only after the window resize DOM event has occurred. MozReview-Commit-ID: 7ygZuNJZzq2
testing/marionette/driver.js
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -2438,23 +2438,30 @@ GeckoDriver.prototype.getWindowSize = fu
 
 /**
  * Set the size of the browser window currently in focus.
  *
  * Not supported on B2G. The supplied width and height values refer to
  * the window outerWidth and outerHeight values, which include scroll
  * bars, title bars, etc.
  */
-GeckoDriver.prototype.setWindowSize = function (cmd, resp) {
+GeckoDriver.prototype.setWindowSize = function* (cmd, resp) {
   assert.firefox()
 
   let {width, height} = cmd.parameters;
+
   let win = this.getCurrentWindow();
-  win.resizeTo(width, height);
-  this.getWindowSize(cmd, resp);
+  yield new Promise(resolve => {
+    win.addEventListener("resize", resolve, {once: true});
+    win.resizeTo(width, height);
+  });
+  return {
+    width: win.outerWidth,
+    height: win.outerHeight,
+  };
 };
 
 /**
  * Maximizes the user agent window as if the user pressed the maximise
  * button.
  *
  * Not Supported on B2G or Fennec.
  */