forked from mirrors/gecko-dev
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
35 lines
1.7 KiB
JavaScript
35 lines
1.7 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/
|
|
*/
|
|
|
|
"use strict";
|
|
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
const {AttributionCode} = ChromeUtils.import("resource:///modules/AttributionCode.jsm");
|
|
const {ASRouterTargeting} = ChromeUtils.import("resource://activity-stream/lib/ASRouterTargeting.jsm");
|
|
|
|
add_task(async function check_attribution_data() {
|
|
// Some setup to fake the correct attribution data
|
|
const appPath = Services.dirsvc.get("GreD", Ci.nsIFile).parent.parent.path;
|
|
const attributionSvc = Cc["@mozilla.org/mac-attribution;1"]
|
|
.getService(Ci.nsIMacAttributionService);
|
|
const campaign = "non-fx-button";
|
|
const source = "addons.mozilla.org";
|
|
const referrer = `https://allizom.org/anything/?utm_campaign=${campaign}&utm_source=${source}`;
|
|
attributionSvc.setReferrerUrl(appPath, referrer, true);
|
|
AttributionCode._clearCache();
|
|
AttributionCode.getAttrDataAsync();
|
|
|
|
const {campaign: attributionCampain, source: attributionSource} = ASRouterTargeting.Environment.attributionData;
|
|
equal(attributionCampain, campaign, "should get the correct campaign out of attributionData");
|
|
equal(attributionSource, source, "should get the correct source out of attributionData");
|
|
|
|
const messages = [
|
|
{id: "foo1", targeting: "attributionData.campaign == 'back_to_school' && attributionData.source == 'addons.mozilla.org'"},
|
|
{id: "foo2", targeting: "attributionData.campaign == 'non-fx-button' && attributionData.source == 'addons.mozilla.org'"},
|
|
];
|
|
|
|
equal(await ASRouterTargeting.findMatchingMessage({messages}), messages[1],
|
|
"should select the message with the correct campaign and source");
|
|
AttributionCode._clearCache();
|
|
});
|