From adf6b1ae3eb45e20d9cc63305d83cf6eedc2d2e2 Mon Sep 17 00:00:00 2001
From: Andreas Tolfsen <ato@sny.no>
Date: Tue, 1 Aug 2017 18:17:29 +0100
Subject: [PATCH] Bug 1381876 - Return window rect from Context#rect
consistently. r=automatedtester
MozReview-Commit-ID: D5pCPK2PEr3
--HG--
extra : rebase_source : a9e6c80314084a6b9fe3b4313d1599911528297b
---
testing/marionette/driver.js | 26 +++-----------------------
1 file changed, 3 insertions(+), 23 deletions(-)
diff --git a/testing/marionette/driver.js b/testing/marionette/driver.js
index c7abc7a6ed48a..30958649a69e3 100644
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -2911,26 +2911,17 @@ GeckoDriver.prototype.minimizeWindow = function* (cmd, resp) {
const win = assert.window(this.getCurrentWindow());
assert.noUserPrompt(this.dialog);
- let state;
yield new Promise(resolve => {
win.addEventListener("sizemodechange", resolve, {once: true});
if (win.windowState == win.STATE_MINIMIZED) {
win.restore();
- state = "normal";
} else {
win.minimize();
- state = "minimized";
}
});
- resp.body = {
- x: win.screenX,
- y: win.screenY,
- width: win.outerWidth,
- height: win.outerHeight,
- state,
- };
+ return this.curBrowser.rect;
};
/**
@@ -2964,12 +2955,7 @@ GeckoDriver.prototype.maximizeWindow = function* (cmd, resp) {
}
});
- resp.body = {
- x: win.screenX,
- y: win.screenY,
- width: win.outerWidth,
- height: win.outerHeight,
- };
+ return this.curBrowser.rect;
};
/**
@@ -2996,16 +2982,10 @@ GeckoDriver.prototype.fullscreen = function* (cmd, resp) {
yield new Promise(resolve => {
win.addEventListener("sizemodechange", resolve, {once: true});
-
win.fullScreen = !win.fullScreen;
});
- resp.body = {
- x: win.screenX,
- y: win.screenY,
- width: win.outerWidth,
- height: win.outerHeight,
- };
+ return this.curBrowser.rect;
};
/**
--
GitLab