mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-12 22:28:59 +02:00
e930b89c34
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
78 lines
2.6 KiB
JavaScript
78 lines
2.6 KiB
JavaScript
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
|
|
/* Any copyright is dedicated to the Public Domain.
|
|
http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
|
|
|
const paymentSrv = Cc[
|
|
"@mozilla.org/dom/payments/payment-request-service;1"
|
|
].getService(Ci.nsIPaymentRequestService);
|
|
|
|
const TestingUIService = {
|
|
showPayment(requestId, name = "", email = "", phone = "") {
|
|
const showResponseData = Cc[
|
|
"@mozilla.org/dom/payments/general-response-data;1"
|
|
].createInstance(Ci.nsIGeneralResponseData);
|
|
showResponseData.initData({});
|
|
const showResponse = Cc[
|
|
"@mozilla.org/dom/payments/payment-show-action-response;1"
|
|
].createInstance(Ci.nsIPaymentShowActionResponse);
|
|
showResponse.init(
|
|
requestId,
|
|
Ci.nsIPaymentActionResponse.PAYMENT_ACCEPTED,
|
|
"testing-payment-method", // payment method
|
|
showResponseData, // payment method data
|
|
name,
|
|
email,
|
|
phone
|
|
);
|
|
paymentSrv.respondPayment(
|
|
showResponse.QueryInterface(Ci.nsIPaymentActionResponse)
|
|
);
|
|
},
|
|
// .retry({ payer }) and .updateWith({payerErrors}) both get routed here:
|
|
updatePayment(requestId) {
|
|
// Let's echo what was sent in by the error...
|
|
const request = paymentSrv.getPaymentRequestById(requestId);
|
|
const { name, email, phone } = request.paymentDetails.payerErrors;
|
|
const { error } = request.paymentDetails;
|
|
// Let's use the .error as the switch
|
|
switch (error) {
|
|
case "retry-fire-payerdetaichangeevent": {
|
|
paymentSrv.changePayerDetail(requestId, name, email, phone);
|
|
break;
|
|
}
|
|
case "update-with": {
|
|
this.showPayment(requestId, name, email, phone);
|
|
break;
|
|
}
|
|
default:
|
|
const msg = `Expect details.error value: '${error}'`;
|
|
sendAsyncMessage("test-fail", msg);
|
|
}
|
|
},
|
|
completePayment(requestId) {
|
|
const request = paymentSrv.getPaymentRequestById(requestId);
|
|
const completeResponse = Cc[
|
|
"@mozilla.org/dom/payments/payment-complete-action-response;1"
|
|
].createInstance(Ci.nsIPaymentCompleteActionResponse);
|
|
completeResponse.init(
|
|
requestId,
|
|
Ci.nsIPaymentActionResponse.COMPLETE_SUCCEEDED
|
|
);
|
|
paymentSrv.respondPayment(
|
|
completeResponse.QueryInterface(Ci.nsIPaymentActionResponse)
|
|
);
|
|
},
|
|
get QueryInterface() {
|
|
return ChromeUtils.generateQI([Ci.nsIPaymentUIService]);
|
|
},
|
|
};
|
|
|
|
paymentSrv.setTestingUIService(
|
|
TestingUIService.QueryInterface(Ci.nsIPaymentUIService)
|
|
);
|
|
|
|
addMessageListener("teardown", () => {
|
|
paymentSrv.setTestingUIService(null);
|
|
sendAsyncMessage("teardown-complete");
|
|
});
|