mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 05:08:36 +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
77 lines
2.6 KiB
JavaScript
77 lines
2.6 KiB
JavaScript
var {NewTabUtils} = ChromeUtils.import("resource://gre/modules/NewTabUtils.jsm");
|
|
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
|
Cu.importGlobalProperties(["btoa"]);
|
|
|
|
ChromeUtils.defineModuleGetter(this, "PlacesTestUtils",
|
|
"resource://testing-common/PlacesTestUtils.jsm");
|
|
|
|
ChromeUtils.defineModuleGetter(this, "PlacesUtils",
|
|
"resource://gre/modules/PlacesUtils.jsm");
|
|
|
|
const PREF_NEWTAB_ENHANCED = "browser.newtabpage.enhanced";
|
|
const SEARCH_SHORTCUTS_EXPERIMENT_PREF = "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts";
|
|
|
|
// use time at the start of the tests, chnaging it inside timeDaysAgo()
|
|
// may cause tiny time differences, which break expected sql ordering
|
|
const TIME_NOW = (new Date()).getTime();
|
|
|
|
Services.prefs.setBoolPref(PREF_NEWTAB_ENHANCED, true);
|
|
Services.prefs.setBoolPref(SEARCH_SHORTCUTS_EXPERIMENT_PREF, false);
|
|
|
|
do_get_profile();
|
|
|
|
// utility function to compute past timestamp in microseconds
|
|
function timeDaysAgo(numDays) {
|
|
return (TIME_NOW - (numDays * 24 * 60 * 60 * 1000)) * 1000;
|
|
}
|
|
|
|
// tests that timestamp falls within 10 days of now
|
|
function isVisitDateOK(timestampMS) {
|
|
let range = 10 * 24 * 60 * 60 * 1000;
|
|
return Math.abs(Date.now() - timestampMS) < range;
|
|
}
|
|
|
|
// a set up function to prep the activity stream provider
|
|
function setUpActivityStreamTest() {
|
|
return (async function() {
|
|
await PlacesUtils.history.clear();
|
|
await PlacesUtils.bookmarks.eraseEverything();
|
|
let faviconExpiredPromise = new Promise(resolve => {
|
|
Services.obs.addObserver(resolve, "places-favicons-expired");
|
|
});
|
|
PlacesUtils.favicons.expireAllFavicons();
|
|
await faviconExpiredPromise;
|
|
})();
|
|
}
|
|
|
|
function do_check_links(actualLinks, expectedLinks) {
|
|
Assert.ok(Array.isArray(actualLinks));
|
|
Assert.equal(actualLinks.length, expectedLinks.length);
|
|
for (let i = 0; i < expectedLinks.length; i++) {
|
|
let expected = expectedLinks[i];
|
|
let actual = actualLinks[i];
|
|
Assert.equal(actual.url, expected.url);
|
|
Assert.equal(actual.title, expected.title);
|
|
Assert.equal(actual.frecency, expected.frecency);
|
|
Assert.equal(actual.lastVisitDate, expected.lastVisitDate);
|
|
}
|
|
}
|
|
|
|
function makeLinks(frecRangeStart, frecRangeEnd, step) {
|
|
let links = [];
|
|
// Remember, links are ordered by frecency descending.
|
|
for (let i = frecRangeEnd; i > frecRangeStart; i -= step) {
|
|
links.push(makeLink(i));
|
|
}
|
|
return links;
|
|
}
|
|
|
|
function makeLink(frecency) {
|
|
return {
|
|
url: "http://example" + frecency + ".com/",
|
|
title: "My frecency is " + frecency,
|
|
frecency,
|
|
lastVisitDate: 0,
|
|
};
|
|
}
|