mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1670785 - Fix ASRouter devtools force attribution on MacOS r=andreio 

Differential Revision: https://phabricator.services.mozilla.com/D93299
This commit is contained in:
Punam Dahiya 2020-10-13 22:25:48 +00:00
Родитель 801d8a1cfc
Коммит ceddaceffd
4 изменённых файлов: 17 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
Просмотреть файл

@ -1461,7 +1461,8 @@ export class ASRouterAdminInner extends React.PureComponent {
different attribution parameters, enter them in the text boxes. If you
wish to try a different addon with the Return To AMO flow, make sure
the 'content' text box has the addon GUID, then click 'Force
Attribution'.
Attribution'. Clicking on 'Force Attribution' with blank text boxes
reset attribution data.
</p>
<table>
<tr>

2
browser/components/newtab/data/content/activity-stream.bundle.js
Просмотреть файл

@ -1915,7 +1915,7 @@ class ASRouterAdminInner extends react__WEBPACK_IMPORTED_MODULE_4___default.a.Pu
}
renderAttributionParamers() {
return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h2", null, " Attribution Parameters "), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("p", null, " ", "This forces the browser to set some attribution parameters, useful for testing the Return To AMO feature. Clicking on 'Force Attribution', with the default values in each field, will demo the Return To AMO flow with the addon called 'Iridium for Youtube'. If you wish to try different attribution parameters, enter them in the text boxes. If you wish to try a different addon with the Return To AMO flow, make sure the 'content' text box has the addon GUID, then click 'Force Attribution'."), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("b", null, " Source ")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("input", {
return react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("h2", null, " Attribution Parameters "), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("p", null, " ", "This forces the browser to set some attribution parameters, useful for testing the Return To AMO feature. Clicking on 'Force Attribution', with the default values in each field, will demo the Return To AMO flow with the addon called 'Iridium for Youtube'. If you wish to try different attribution parameters, enter them in the text boxes. If you wish to try a different addon with the Return To AMO flow, make sure the 'content' text box has the addon GUID, then click 'Force Attribution'. Clicking on 'Force Attribution' with blank text boxes reset attribution data."), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("table", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("tr", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("b", null, " Source ")), react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("td", null, " ", react__WEBPACK_IMPORTED_MODULE_4___default.a.createElement("input", {
type: "text",
name: "source",
placeholder: "addons.mozilla.org",

18
browser/components/newtab/lib/ASRouter.jsm
Просмотреть файл

@ -32,6 +32,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
SpecialMessageActions:
"resource://messaging-system/lib/SpecialMessageActions.jsm",
TargetingContext: "resource://messaging-system/targeting/Targeting.jsm",
MacAttribution: "resource:///modules/MacAttribution.jsm",
});
XPCOMUtils.defineLazyServiceGetters(this, {
BrowserHandler: ["@mozilla.org/browser/clh;1", "nsIBrowserHandler"],
@ -1716,14 +1717,6 @@ class _ASRouter {
}
}
// Windows specific calls to write attribution data
// Used by `forceAttribution` to set required targeting attributes for
// RTAMO messages. This should only be called from within about:newtab#asrouter
/* istanbul ignore next */
async _writeAttributionFile(data) {
await AttributionCode.writeAttributionFile(data);
}
/**
* forceAttribution - this function should only be called from within about:newtab#asrouter.
* It forces the browser attribution to be set to something specified in asrouter admin
@ -1738,9 +1731,11 @@ class _ASRouter {
.join("&");
if (AppConstants.platform === "win") {
// The whole attribution data is encoded (again) for windows
this._writeAttributionFile(encodeURIComponent(attributionData));
await AttributionCode.writeAttributionFile(
encodeURIComponent(attributionData)
);
} else if (AppConstants.platform === "macosx") {
let appPath = Services.dirsvc.get("GreD", Ci.nsIFile).parent.parent.path;
let appPath = MacAttribution.applicationPath;
let attributionSvc = Cc["@mozilla.org/mac-attribution;1"].getService(
Ci.nsIMacAttributionService
);
@ -1750,6 +1745,9 @@ class _ASRouter {
// This sets the Attribution to be the referrer
attributionSvc.setReferrerUrl(appPath, referrer, true);
// Delete attribution data file
await AttributionCode.deleteFileAsync();
}
// Clear cache call is only possible in a testing environment

8
browser/components/newtab/test/unit/asrouter/ASRouter.test.js
Просмотреть файл

@ -146,6 +146,8 @@ describe("ASRouter", () => {
allowedCodeKeys: ["foo", "bar", "baz"],
_clearCache: () => sinon.stub(),
getAttrDataAsync: () => Promise.resolve({ content: "addonID" }),
deleteFileAsync: () => Promise.resolve(),
writeAttributionFile: () => Promise.resolve(),
};
FakeBookmarkPanelHub = {
init: sandbox.stub(),
@ -186,6 +188,7 @@ describe("ASRouter", () => {
AttributionCode: fakeAttributionCode,
SnippetsTestMessageProvider,
PanelTestProvider,
MacAttribution: { applicationPath: "" },
BookmarkPanelHub: FakeBookmarkPanelHub,
ToolbarBadgeHub: FakeToolbarBadgeHub,
ToolbarPanelHub: FakeToolbarPanelHub,
@ -2846,6 +2849,7 @@ describe("ASRouter", () => {
assert.calledWithExactly(Router.forceAttribution, msg.data.data);
});
it("should force attribution and update providers", async () => {
sandbox.stub(AppConstants, "platform").value("");
sandbox.stub(Router, "_updateMessageProviders");
sandbox.stub(Router, "loadMessagesFromAllProviders");
sandbox.stub(fakeAttributionCode, "_clearCache");
@ -2862,13 +2866,13 @@ describe("ASRouter", () => {
assert.calledOnce(Router.loadMessagesFromAllProviders);
});
it("should double encode on windows", async () => {
sandbox.stub(Router, "_writeAttributionFile");
sandbox.stub(fakeAttributionCode, "writeAttributionFile");
Router.forceAttribution({ foo: "FOO!", eh: "NOPE", bar: "BAR?" });
assert.notCalled(setReferrerUrl);
assert.calledWithMatch(
Router._writeAttributionFile,
fakeAttributionCode.writeAttributionFile,
"foo%3DFOO!%26bar%3DBAR%253F"
);
});