Commit 0082e288 authored by Henrik Skupin's avatar Henrik Skupin
Browse files

Bug 1584927 - [marionette] Handle user prompts in "Take Element Screenshot"... 

Bug 1584927 - [marionette] Handle user prompts in "Take Element Screenshot" and "Take Screenshot" commands. r=webdriver-reviewers,ato

Differential Revision: https://phabricator.services.mozilla.com/D48511

--HG--
extra : moz-landing-system : lando
parent 72207a27

testing/marionette/driver.js

+1 −0
Original line number Diff line number Diff line
@@ -3019,6 +3019,7 @@ GeckoDriver.prototype.deleteSession = function() { 
 */

GeckoDriver.prototype.takeScreenshot = async function(cmd) {

  let win = assert.open(this.getCurrentWindow());

  await this._handleUserPrompts();



  let { id, full, hash, scroll } = cmd.parameters;

  let format = hash ? capture.Format.Hash : capture.Format.Base64;

testing/web-platform/meta/webdriver/tests/take_element_screenshot/user_prompts.py.ini

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
[user_prompts.py]

  [test_accept_and_notify[capabilities0-prompt-\]]

    expected: FAIL



  [test_dismiss[capabilities0-alert-None\]]

    expected: FAIL



  [test_dismiss_and_notify[capabilities0-prompt-None\]]

    expected: FAIL



  [test_dismiss_and_notify[capabilities0-alert-None\]]

    expected: FAIL



  [test_dismiss_and_notify[capabilities0-confirm-False\]]

    expected: FAIL



  [test_default[alert-None\]]

    expected: FAIL



  [test_accept[capabilities0-confirm-True\]]

    expected: FAIL



  [test_accept_and_notify[capabilities0-confirm-True\]]

    expected: FAIL



  [test_accept[capabilities0-alert-None\]]

    expected: FAIL



  [test_ignore[capabilities0-prompt\]]

    expected: FAIL



  [test_default[confirm-False\]]

    expected: FAIL



  [test_ignore[capabilities0-alert\]]

    expected: FAIL



  [test_ignore[capabilities0-confirm\]]

    expected: FAIL



  [test_accept_and_notify[capabilities0-alert-None\]]

    expected: FAIL



  [test_dismiss[capabilities0-prompt-None\]]

    expected: FAIL



  [test_accept[capabilities0-prompt-\]]

    expected: FAIL



  [test_default[prompt-None\]]

    expected: FAIL



  [test_dismiss[capabilities0-confirm-False\]]

    expected: FAIL

testing/web-platform/meta/webdriver/tests/take_screenshot/user_prompts.py.ini

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
[user_prompts.py]

  [test_accept_and_notify[capabilities0-prompt-\]]

    expected: FAIL



  [test_dismiss[capabilities0-alert-None\]]

    expected: FAIL



  [test_dismiss_and_notify[capabilities0-prompt-None\]]

    expected: FAIL



  [test_dismiss_and_notify[capabilities0-alert-None\]]

    expected: FAIL



  [test_dismiss_and_notify[capabilities0-confirm-False\]]

    expected: FAIL



  [test_default[alert-None\]]

    expected: FAIL



  [test_accept[capabilities0-confirm-True\]]

    expected: FAIL



  [test_accept_and_notify[capabilities0-confirm-True\]]

    expected: FAIL



  [test_accept[capabilities0-alert-None\]]

    expected: FAIL



  [test_ignore[capabilities0-prompt\]]

    expected: FAIL



  [test_default[confirm-False\]]

    expected: FAIL



  [test_ignore[capabilities0-alert\]]

    expected: FAIL



  [test_ignore[capabilities0-confirm\]]

    expected: FAIL



  [test_accept_and_notify[capabilities0-alert-None\]]

    expected: FAIL



  [test_dismiss[capabilities0-prompt-None\]]

    expected: FAIL



  [test_accept[capabilities0-prompt-\]]

    expected: FAIL



  [test_default[prompt-None\]]

    expected: FAIL



  [test_dismiss[capabilities0-confirm-False\]]

    expected: FAIL