mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-11 13:48:23 +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
81 lines
2.2 KiB
JavaScript
81 lines
2.2 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
"use strict";
|
|
|
|
const {WebChannelBroker} = ChromeUtils.import("resource://gre/modules/WebChannel.jsm");
|
|
|
|
const VALID_WEB_CHANNEL_ID = "id";
|
|
const URL_STRING = "http://example.com";
|
|
const VALID_WEB_CHANNEL_ORIGIN = Services.io.newURI(URL_STRING);
|
|
|
|
/**
|
|
* Test WebChannelBroker channel map
|
|
*/
|
|
add_test(function test_web_channel_broker_channel_map() {
|
|
let channel = {};
|
|
let channel2 = {};
|
|
|
|
Assert.equal(WebChannelBroker._channelMap.size, 0);
|
|
Assert.ok(!WebChannelBroker._messageListenerAttached);
|
|
|
|
// make sure _channelMap works correctly
|
|
WebChannelBroker.registerChannel(channel);
|
|
Assert.equal(WebChannelBroker._channelMap.size, 1);
|
|
Assert.ok(WebChannelBroker._messageListenerAttached);
|
|
|
|
WebChannelBroker.registerChannel(channel2);
|
|
Assert.equal(WebChannelBroker._channelMap.size, 2);
|
|
|
|
WebChannelBroker.unregisterChannel(channel);
|
|
Assert.equal(WebChannelBroker._channelMap.size, 1);
|
|
|
|
// make sure the correct channel is unregistered
|
|
Assert.ok(!WebChannelBroker._channelMap.has(channel));
|
|
Assert.ok(WebChannelBroker._channelMap.has(channel2));
|
|
|
|
WebChannelBroker.unregisterChannel(channel2);
|
|
Assert.equal(WebChannelBroker._channelMap.size, 0);
|
|
|
|
run_next_test();
|
|
});
|
|
|
|
|
|
/**
|
|
* Test WebChannelBroker _listener test
|
|
*/
|
|
add_task(function test_web_channel_broker_listener() {
|
|
return new Promise((resolve, reject) => {
|
|
var channel = {
|
|
id: VALID_WEB_CHANNEL_ID,
|
|
_originCheckCallback: requestPrincipal => {
|
|
return VALID_WEB_CHANNEL_ORIGIN.prePath === requestPrincipal.origin;
|
|
},
|
|
deliver(data, sender) {
|
|
Assert.equal(data.id, VALID_WEB_CHANNEL_ID);
|
|
Assert.equal(data.message.command, "hello");
|
|
Assert.notEqual(sender, undefined);
|
|
WebChannelBroker.unregisterChannel(channel);
|
|
resolve();
|
|
},
|
|
};
|
|
|
|
WebChannelBroker.registerChannel(channel);
|
|
|
|
var mockEvent = {
|
|
data: {
|
|
id: VALID_WEB_CHANNEL_ID,
|
|
message: {
|
|
command: "hello",
|
|
},
|
|
},
|
|
principal: {
|
|
origin: URL_STRING,
|
|
},
|
|
objects: {
|
|
},
|
|
};
|
|
|
|
WebChannelBroker._listener(mockEvent);
|
|
});
|
|
});
|