author | Sebastian Hengst <archaeopteryx@coole-files.de> |
Sat, 12 Aug 2017 13:45:24 +0200 (2017-08-12) | |
changeset 374384 | f4c629f0e4fc25f03c4a1142b9d4fff97fb858e7 |
parent 374383 | 9d576871fd33bed006dcdccfba880a4ed591f870 |
child 374385 | 1ec28be2c6f2ec8cb7ba7ce60ac0b78cfe0e3134 |
push id | 48636 |
push user | archaeopteryx@coole-files.de |
push date | Sat, 12 Aug 2017 11:46:58 +0000 (2017-08-12) |
treeherder | autoland@1ec28be2c6f2 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1382388 |
milestone | 57.0a1 |
backs out | 5dae0072182fdd0e8687a1c19e78b6993595489a |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/toolkit/components/payments/test/browser/browser_show_dialog.js +++ b/toolkit/components/payments/test/browser/browser_show_dialog.js @@ -24,30 +24,8 @@ add_task(async function test_show_abort_ ok(requestId, "requestId should be defined"); ok(!win.closed, "dialog should not be closed"); // abort the payment request await ContentTask.spawn(browser, null, async() => content.rq.abort()); ok(win.closed, "dialog should be closed"); }); }); - -add_task(async function test_show_manualAbort_dialog() { - await BrowserTestUtils.withNewTab({ - gBrowser, - url: BLANK_PAGE_URL, - }, async browser => { - // start by creating a PaymentRequest, and show it - await ContentTask.spawn(browser, {methodData, details}, ContentTasks.createAndShowRequest); - - // get a reference to the UI dialog and the requestId - let win = await getDialogWindow(); - let requestId = paymentUISrv.requestIdForWindow(win); - ok(requestId, "requestId should be defined"); - ok(!win.closed, "dialog should not be closed"); - - // abort the payment request manually - let frameLoader = win.document.getElementById("paymentRequestFrame").frameLoader; - await ContentTask.spawn(frameLoader, null, ContentTasks.manuallyClickCancel); - - ok(win.closed, "dialog should be closed"); - }); -});
--- a/toolkit/components/payments/test/browser/head.js +++ b/toolkit/components/payments/test/browser/head.js @@ -29,18 +29,14 @@ async function getDialogWindow() { * Common content tasks functions to be used with ContentTask.spawn. */ let ContentTasks = { createAndShowRequest: async ({methodData, details, options}) => { let rq = new content.PaymentRequest(methodData, details, options); content.rq = rq; // assign it so we can retrieve it later rq.show(); }, - - manuallyClickCancel: async () => { - content.document.getElementById("cancel").click(); - }, }; add_task(async function setup_head() { await SpecialPowers.pushPrefEnv({set: [[PREF_PAYMENT_ENABLED, true]]}); });