mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-12 06:08:24 +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
83 lines
2.9 KiB
JavaScript
83 lines
2.9 KiB
JavaScript
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
// Import common head.
|
|
/* import-globals-from ../../../../../toolkit/components/places/tests/head_common.js */
|
|
var commonFile = do_get_file("../../../../../toolkit/components/places/tests/head_common.js", false);
|
|
if (commonFile) {
|
|
let uri = Services.io.newFileURI(commonFile);
|
|
Services.scriptloader.loadSubScript(uri.spec, this);
|
|
}
|
|
|
|
// Put any other stuff relative to this test folder below.
|
|
|
|
ChromeUtils.defineModuleGetter(this, "PlacesUIUtils",
|
|
"resource:///modules/PlacesUIUtils.jsm");
|
|
|
|
// Needed by some test that relies on having an app registered.
|
|
ChromeUtils.import("resource://testing-common/AppInfo.jsm", this);
|
|
updateAppInfo({
|
|
name: "PlacesTest",
|
|
ID: "{230de50e-4cd1-11dc-8314-0800200c9a66}",
|
|
version: "1",
|
|
platformVersion: "",
|
|
});
|
|
|
|
// Default bookmarks constants.
|
|
const DEFAULT_BOOKMARKS_ON_TOOLBAR = 1;
|
|
const DEFAULT_BOOKMARKS_ON_MENU = 1;
|
|
|
|
function checkItemHasAnnotation(guid, name) {
|
|
return PlacesUtils.promiseItemId(guid).then(id => {
|
|
let hasAnnotation = PlacesUtils.annotations.itemHasAnnotation(id, name);
|
|
Assert.ok(hasAnnotation, `Expected annotation ${name}`);
|
|
});
|
|
}
|
|
|
|
var createCorruptDB = async function() {
|
|
let dbPath = OS.Path.join(OS.Constants.Path.profileDir, "places.sqlite");
|
|
await OS.File.remove(dbPath);
|
|
|
|
// Create a corrupt database.
|
|
let dir = await OS.File.getCurrentDirectory();
|
|
let src = OS.Path.join(dir, "corruptDB.sqlite");
|
|
await OS.File.copy(src, dbPath);
|
|
|
|
// Check there's a DB now.
|
|
Assert.ok((await OS.File.exists(dbPath)), "should have a DB now");
|
|
};
|
|
|
|
const SINGLE_TRY_TIMEOUT = 100;
|
|
const NUMBER_OF_TRIES = 30;
|
|
|
|
/**
|
|
* Similar to waitForConditionPromise, but poll for an asynchronous value
|
|
* every SINGLE_TRY_TIMEOUT ms, for no more than tryCount times.
|
|
*
|
|
* @param promiseFn
|
|
* A function to generate a promise, which resolves to the expected
|
|
* asynchronous value.
|
|
* @param timeoutMsg
|
|
* The reason to reject the returned promise with.
|
|
* @param [optional] tryCount
|
|
* Maximum times to try before rejecting the returned promise with
|
|
* timeoutMsg, defaults to NUMBER_OF_TRIES.
|
|
* @return {Promise}
|
|
* @resolves to the asynchronous value being polled.
|
|
* @rejects if the asynchronous value is not available after tryCount attempts.
|
|
*/
|
|
var waitForResolvedPromise = async function(promiseFn, timeoutMsg, tryCount = NUMBER_OF_TRIES) {
|
|
let tries = 0;
|
|
do {
|
|
try {
|
|
let value = await promiseFn();
|
|
return value;
|
|
} catch (ex) {}
|
|
await new Promise(resolve => do_timeout(SINGLE_TRY_TIMEOUT, resolve));
|
|
} while (++tries <= tryCount);
|
|
throw new Error(timeoutMsg);
|
|
};
|