mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 21:28:04 +02:00
***
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
90 lines
2.8 KiB
JavaScript
90 lines
2.8 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
const URL = "http://mochi.test:8888/";
|
|
const URL_COPY = URL + "#copy";
|
|
|
|
const {Sanitizer} = ChromeUtils.import("resource:///modules/Sanitizer.jsm");
|
|
|
|
/**
|
|
* These tests ensure that the thumbnail storage is working as intended.
|
|
* Newly captured thumbnails should be saved as files and they should as well
|
|
* be removed when the user sanitizes their history.
|
|
*/
|
|
function* runTests() {
|
|
yield (async function() {
|
|
dontExpireThumbnailURLs([URL, URL_COPY]);
|
|
|
|
await promiseClearHistory();
|
|
await promiseAddVisitsAndRepopulateNewTabLinks(URL);
|
|
await promiseCreateThumbnail();
|
|
|
|
// Make sure Storage.copy() updates an existing file.
|
|
await PageThumbsStorage.copy(URL, URL_COPY);
|
|
let copy = new FileUtils.File(PageThumbsStorageService.getFilePathForURL(URL_COPY));
|
|
let mtime = copy.lastModifiedTime -= 60;
|
|
|
|
await PageThumbsStorage.copy(URL, URL_COPY);
|
|
isnot(new FileUtils.File(PageThumbsStorageService.getFilePathForURL(URL_COPY)).lastModifiedTime, mtime,
|
|
"thumbnail file was updated");
|
|
|
|
let file = new FileUtils.File(PageThumbsStorageService.getFilePathForURL(URL));
|
|
let fileCopy = new FileUtils.File(PageThumbsStorageService.getFilePathForURL(URL_COPY));
|
|
|
|
// Clear the browser history. Retry until the files are gone because Windows
|
|
// locks them sometimes.
|
|
info("Clearing history");
|
|
while (file.exists() || fileCopy.exists()) {
|
|
await promiseClearHistory();
|
|
}
|
|
info("History is clear");
|
|
|
|
info("Repopulating");
|
|
await promiseAddVisitsAndRepopulateNewTabLinks(URL);
|
|
await promiseCreateThumbnail();
|
|
|
|
info("Clearing the last 10 minutes of browsing history");
|
|
// Clear the last 10 minutes of browsing history.
|
|
await promiseClearHistory(true);
|
|
|
|
info("Attempt to clear file");
|
|
// Retry until the file is gone because Windows locks it sometimes.
|
|
await promiseClearFile(file, URL);
|
|
|
|
info("Done");
|
|
})();
|
|
}
|
|
|
|
async function promiseClearFile(aFile, aURL) {
|
|
if (!aFile.exists()) {
|
|
return undefined;
|
|
}
|
|
// Re-add our URL to the history so that history observer's onDeleteURI()
|
|
// is called again.
|
|
await PlacesTestUtils.addVisits(makeURI(aURL));
|
|
await promiseClearHistory(true);
|
|
// Then retry.
|
|
return promiseClearFile(aFile, aURL);
|
|
}
|
|
|
|
function promiseClearHistory(aUseRange) {
|
|
let options = {};
|
|
if (aUseRange) {
|
|
let usec = Date.now() * 1000;
|
|
options.range = [usec - 10 * 60 * 1000 * 1000, usec];
|
|
options.ignoreTimespan = false;
|
|
}
|
|
return Sanitizer.sanitize(["history"], options);
|
|
}
|
|
|
|
function promiseCreateThumbnail() {
|
|
return new Promise(resolve => {
|
|
addTab(URL, function() {
|
|
gBrowserThumbnails.clearTopSiteURLCache();
|
|
whenFileExists(URL, function() {
|
|
gBrowser.removeTab(gBrowser.selectedTab);
|
|
resolve();
|
|
});
|
|
});
|
|
});
|
|
}
|