forked from mirrors/gecko-dev
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
71 lines
2.9 KiB
JavaScript
71 lines
2.9 KiB
JavaScript
"use strict";
|
|
|
|
const {PlacesTestUtils} =
|
|
ChromeUtils.import("resource://testing-common/PlacesTestUtils.jsm");
|
|
|
|
let notificationURL = "http://example.org/browser/browser/base/content/test/alerts/file_dom_notifications.html";
|
|
let oldShowFavicons;
|
|
|
|
add_task(async function test_notificationClose() {
|
|
let notificationURI = makeURI(notificationURL);
|
|
await addNotificationPermission(notificationURL);
|
|
|
|
oldShowFavicons = Services.prefs.getBoolPref("alerts.showFavicons");
|
|
Services.prefs.setBoolPref("alerts.showFavicons", true);
|
|
|
|
await PlacesTestUtils.addVisits(notificationURI);
|
|
let faviconURI = await new Promise(resolve => {
|
|
let uri =
|
|
makeURI("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVQI12P4//8/AAX+Av7czFnnAAAAAElFTkSuQmCC");
|
|
PlacesUtils.favicons.setAndFetchFaviconForPage(notificationURI, uri,
|
|
true, PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE,
|
|
(uriResult) => resolve(uriResult),
|
|
Services.scriptSecurityManager.getSystemPrincipal());
|
|
});
|
|
|
|
await BrowserTestUtils.withNewTab({
|
|
gBrowser,
|
|
url: notificationURL,
|
|
}, async function dummyTabTask(aBrowser) {
|
|
await openNotification(aBrowser, "showNotification2");
|
|
|
|
info("Notification alert showing");
|
|
|
|
let alertWindow = Services.wm.getMostRecentWindow("alert:alert");
|
|
if (!alertWindow) {
|
|
ok(true, "Notifications don't use XUL windows on all platforms.");
|
|
await closeNotification(aBrowser);
|
|
return;
|
|
}
|
|
|
|
let alertTitleLabel = alertWindow.document.getElementById("alertTitleLabel");
|
|
is(alertTitleLabel.value, "Test title", "Title text of notification should be present");
|
|
let alertTextLabel = alertWindow.document.getElementById("alertTextLabel");
|
|
is(alertTextLabel.textContent, "Test body 2", "Body text of notification should be present");
|
|
let alertIcon = alertWindow.document.getElementById("alertIcon");
|
|
is(alertIcon.src, faviconURI.spec, "Icon of notification should be present");
|
|
|
|
let alertCloseButton = alertWindow.document.querySelector(".close-icon");
|
|
is(alertCloseButton.localName, "toolbarbutton", "close button found");
|
|
let promiseBeforeUnloadEvent =
|
|
BrowserTestUtils.waitForEvent(alertWindow, "beforeunload");
|
|
let closedTime = alertWindow.Date.now();
|
|
alertCloseButton.click();
|
|
info("Clicked on close button");
|
|
await promiseBeforeUnloadEvent;
|
|
|
|
ok(true, "Alert should close when the close button is clicked");
|
|
let currentTime = alertWindow.Date.now();
|
|
// The notification will self-close at 12 seconds, so this checks
|
|
// that the notification closed before the timeout.
|
|
ok(currentTime - closedTime < 5000,
|
|
"Close requested at " + closedTime + ", actually closed at " + currentTime);
|
|
});
|
|
});
|
|
|
|
add_task(async function cleanup() {
|
|
Services.perms.remove(makeURI(notificationURL), "desktop-notification");
|
|
if (typeof oldShowFavicons == "boolean") {
|
|
Services.prefs.setBoolPref("alerts.showFavicons", oldShowFavicons);
|
|
}
|
|
});
|