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
142 lines
4 KiB
JavaScript
142 lines
4 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
"use strict";
|
|
|
|
const {WebChannel} = ChromeUtils.import("resource://gre/modules/WebChannel.jsm");
|
|
|
|
const ERROR_ID_ORIGIN_REQUIRED = "WebChannel id and originOrPermission are required.";
|
|
const VALID_WEB_CHANNEL_ID = "id";
|
|
const URL_STRING = "http://example.com";
|
|
const VALID_WEB_CHANNEL_ORIGIN = Services.io.newURI(URL_STRING);
|
|
const TEST_PERMISSION_NAME = "test-webchannel-permissions";
|
|
|
|
var MockWebChannelBroker = {
|
|
_channelMap: new Map(),
|
|
registerChannel(channel) {
|
|
if (!this._channelMap.has(channel)) {
|
|
this._channelMap.set(channel);
|
|
}
|
|
},
|
|
unregisterChannel(channelToRemove) {
|
|
this._channelMap.delete(channelToRemove);
|
|
},
|
|
};
|
|
|
|
/**
|
|
* Web channel tests
|
|
*/
|
|
|
|
/**
|
|
* Test channel listening with originOrPermission being an nsIURI.
|
|
*/
|
|
add_task(function test_web_channel_listen() {
|
|
return new Promise((resolve, reject) => {
|
|
let channel = new WebChannel(VALID_WEB_CHANNEL_ID, VALID_WEB_CHANNEL_ORIGIN, {
|
|
broker: MockWebChannelBroker,
|
|
});
|
|
let delivered = 0;
|
|
Assert.equal(channel.id, VALID_WEB_CHANNEL_ID);
|
|
Assert.equal(channel._originOrPermission.spec, VALID_WEB_CHANNEL_ORIGIN.spec);
|
|
Assert.equal(channel._deliverCallback, null);
|
|
|
|
channel.listen(function(id, message, target) {
|
|
Assert.equal(id, VALID_WEB_CHANNEL_ID);
|
|
Assert.ok(message);
|
|
Assert.ok(message.command);
|
|
Assert.ok(target.sender);
|
|
delivered++;
|
|
// 2 messages should be delivered
|
|
if (delivered === 2) {
|
|
channel.stopListening();
|
|
Assert.equal(channel._deliverCallback, null);
|
|
resolve();
|
|
}
|
|
});
|
|
|
|
// send two messages
|
|
channel.deliver({
|
|
id: VALID_WEB_CHANNEL_ID,
|
|
message: {
|
|
command: "one",
|
|
},
|
|
}, { sender: true });
|
|
|
|
channel.deliver({
|
|
id: VALID_WEB_CHANNEL_ID,
|
|
message: {
|
|
command: "two",
|
|
},
|
|
}, { sender: true });
|
|
});
|
|
});
|
|
|
|
/**
|
|
* Test channel listening with originOrPermission being a permission string.
|
|
*/
|
|
add_task(function test_web_channel_listen_permission() {
|
|
return new Promise((resolve, reject) => {
|
|
// add a new permission
|
|
Services.perms.add(VALID_WEB_CHANNEL_ORIGIN, TEST_PERMISSION_NAME, Services.perms.ALLOW_ACTION);
|
|
registerCleanupFunction(() => Services.perms.remove(VALID_WEB_CHANNEL_ORIGIN, TEST_PERMISSION_NAME));
|
|
let channel = new WebChannel(VALID_WEB_CHANNEL_ID, TEST_PERMISSION_NAME, {
|
|
broker: MockWebChannelBroker,
|
|
});
|
|
let delivered = 0;
|
|
Assert.equal(channel.id, VALID_WEB_CHANNEL_ID);
|
|
Assert.equal(channel._originOrPermission, TEST_PERMISSION_NAME);
|
|
Assert.equal(channel._deliverCallback, null);
|
|
|
|
channel.listen(function(id, message, target) {
|
|
Assert.equal(id, VALID_WEB_CHANNEL_ID);
|
|
Assert.ok(message);
|
|
Assert.ok(message.command);
|
|
Assert.ok(target.sender);
|
|
delivered++;
|
|
// 2 messages should be delivered
|
|
if (delivered === 2) {
|
|
channel.stopListening();
|
|
Assert.equal(channel._deliverCallback, null);
|
|
resolve();
|
|
}
|
|
});
|
|
|
|
// send two messages
|
|
channel.deliver({
|
|
id: VALID_WEB_CHANNEL_ID,
|
|
message: {
|
|
command: "one",
|
|
},
|
|
}, { sender: true });
|
|
|
|
channel.deliver({
|
|
id: VALID_WEB_CHANNEL_ID,
|
|
message: {
|
|
command: "two",
|
|
},
|
|
}, { sender: true });
|
|
});
|
|
});
|
|
|
|
|
|
/**
|
|
* Test constructor
|
|
*/
|
|
add_test(function test_web_channel_constructor() {
|
|
Assert.equal(constructorTester(), ERROR_ID_ORIGIN_REQUIRED);
|
|
Assert.equal(constructorTester(undefined), ERROR_ID_ORIGIN_REQUIRED);
|
|
Assert.equal(constructorTester(undefined, VALID_WEB_CHANNEL_ORIGIN), ERROR_ID_ORIGIN_REQUIRED);
|
|
Assert.equal(constructorTester(VALID_WEB_CHANNEL_ID, undefined), ERROR_ID_ORIGIN_REQUIRED);
|
|
Assert.ok(!constructorTester(VALID_WEB_CHANNEL_ID, VALID_WEB_CHANNEL_ORIGIN));
|
|
|
|
run_next_test();
|
|
});
|
|
|
|
function constructorTester(id, origin) {
|
|
try {
|
|
new WebChannel(id, origin);
|
|
} catch (e) {
|
|
return e.message;
|
|
}
|
|
return false;
|
|
}
|