mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 13:18:45 +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
107 lines
3.6 KiB
JavaScript
107 lines
3.6 KiB
JavaScript
"use strict";
|
|
|
|
const {PlacesUtils} = ChromeUtils.import("resource://gre/modules/PlacesUtils.jsm");
|
|
const {NewTabUtils} = ChromeUtils.import("resource://gre/modules/NewTabUtils.jsm");
|
|
const {PlacesTestUtils} = ChromeUtils.import("resource://testing-common/PlacesTestUtils.jsm");
|
|
|
|
// Disable top site search shortcuts for this test
|
|
Services.prefs.setBoolPref("browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts", false);
|
|
|
|
// A small 1x1 test png
|
|
const IMAGE_1x1 = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVQI12NgAAAAAgAB4iG8MwAAAABJRU5ErkJggg==";
|
|
|
|
add_task(async function test_topSites() {
|
|
let visits = [];
|
|
const numVisits = 15; // To make sure we get frecency.
|
|
let visitDate = new Date(1999, 9, 9, 9, 9).getTime();
|
|
|
|
function setVisit(visit) {
|
|
for (let j = 0; j < numVisits; ++j) {
|
|
visitDate -= 1000;
|
|
visit.visits.push({date: new Date(visitDate)});
|
|
}
|
|
visits.push(visit);
|
|
}
|
|
// Stick a couple sites into history.
|
|
for (let i = 0; i < 2; ++i) {
|
|
setVisit({
|
|
url: `http://example${i}.com/`,
|
|
title: `visit${i}`,
|
|
visits: [],
|
|
});
|
|
setVisit({
|
|
url: `http://www.example${i}.com/foobar`,
|
|
title: `visit${i}-www`,
|
|
visits: [],
|
|
});
|
|
}
|
|
NewTabUtils.init();
|
|
await PlacesUtils.history.insertMany(visits);
|
|
|
|
// Insert a favicon to show that favicons are not returned by default.
|
|
let faviconData = new Map();
|
|
faviconData.set("http://example0.com", IMAGE_1x1);
|
|
await PlacesTestUtils.addFavicons(faviconData);
|
|
|
|
// Ensure our links show up in activityStream.
|
|
let links = await NewTabUtils.activityStreamLinks.getTopSites({onePerDomain: false, topsiteFrecency: 1});
|
|
|
|
equal(links.length, visits.length, "Top sites has been successfully initialized");
|
|
|
|
// Drop the visits.visits for later testing.
|
|
visits = visits.map(v => { return {url: v.url, title: v.title, favicon: undefined}; });
|
|
|
|
// Test that results from all providers are returned by default.
|
|
let extension = ExtensionTestUtils.loadExtension({
|
|
manifest: {
|
|
"permissions": [
|
|
"topSites",
|
|
],
|
|
},
|
|
background() {
|
|
browser.test.onMessage.addListener(async options => {
|
|
let sites;
|
|
if (typeof options !== undefined) {
|
|
sites = await browser.topSites.get(options);
|
|
} else {
|
|
sites = await browser.topSites.get();
|
|
}
|
|
browser.test.sendMessage("sites", sites);
|
|
});
|
|
},
|
|
});
|
|
|
|
await extension.startup();
|
|
|
|
function getSites(options) {
|
|
extension.sendMessage(options);
|
|
return extension.awaitMessage("sites");
|
|
}
|
|
|
|
Assert.deepEqual([visits[0], visits[2]],
|
|
await getSites(),
|
|
"got topSites default");
|
|
Assert.deepEqual(visits,
|
|
await getSites({onePerDomain: false}),
|
|
"got topSites all links");
|
|
|
|
NewTabUtils.activityStreamLinks.blockURL(visits[0]);
|
|
ok(NewTabUtils.blockedLinks.isBlocked(visits[0]), `link ${visits[0].url} is blocked`);
|
|
|
|
Assert.deepEqual([visits[2], visits[1]],
|
|
await getSites(),
|
|
"got topSites with blocked links filtered out");
|
|
Assert.deepEqual([visits[0], visits[2]],
|
|
await getSites({includeBlocked: true}),
|
|
"got topSites with blocked links included");
|
|
|
|
// Test favicon result
|
|
let topSites = await getSites({includeBlocked: true, includeFavicon: true});
|
|
equal(topSites[0].favicon, IMAGE_1x1, "received favicon");
|
|
|
|
equal(1, (await getSites({limit: 1, includeBlocked: true})).length, "limit 1 topSite");
|
|
|
|
NewTabUtils.uninit();
|
|
await extension.unload();
|
|
await PlacesUtils.history.clear();
|
|
});
|