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

Bug 1781086 - Handle dismiss telemetry in Feature Callout r=Mardak 

Differential Revision: https://phabricator.services.mozilla.com/D153787
This commit is contained in:
Meg Viar 2022-08-10 17:17:42 +00:00
Родитель 8bc30afa79
Коммит 5b715b9b64
2 изменённых файлов: 87 добавлений и 27 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

36
browser/components/firefoxview/featureCallout.mjs
Просмотреть файл

@ -103,7 +103,17 @@ const MESSAGES = [
},
dismiss_button: {
action: {
navigate: true,
type: "SET_PREF",
data: {
pref: {
name: "browser.firefox-view.feature-tour",
value: JSON.stringify({
message: "FIREFOX_VIEW_FEATURE_TOUR",
screen: "FEATURE_CALLOUT_1",
complete: true,
}),
},
},
},
},
},
@ -135,7 +145,17 @@ const MESSAGES = [
},
dismiss_button: {
action: {
navigate: true,
type: "SET_PREF",
data: {
pref: {
name: "browser.firefox-view.feature-tour",
value: JSON.stringify({
message: "FIREFOX_VIEW_FEATURE_TOUR",
screen: "FEATURE_CALLOUT_2",
complete: true,
}),
},
},
},
},
},
@ -171,7 +191,17 @@ const MESSAGES = [
},
dismiss_button: {
action: {
navigate: true,
type: "SET_PREF",
data: {
pref: {
name: "browser.firefox-view.feature-tour",
value: JSON.stringify({
message: "FIREFOX_VIEW_FEATURE_TOUR",
screen: "FEATURE_CALLOUT_3",
complete: true,
}),
},
},
},
},
},

78
browser/components/firefoxview/tests/browser/browser_feature_callout.js
Просмотреть файл

@ -5,6 +5,8 @@ const { calloutMessages } = ChromeUtils.importESModule(
);
const calloutSelector = "#root.featureCallout";
const featureTourPref = "browser.firefox-view.feature-tour";
const waitForCalloutRender = async doc => {
// Wait for callout to be rendered
await BrowserTestUtils.waitForMutationCondition(
@ -34,13 +36,21 @@ const waitForCalloutScreen = async (doc, screenId) => {
);
};
const waitForCalloutRemoved = async doc => {
await BrowserTestUtils.waitForMutationCondition(
doc.body,
{ childList: true },
() => !doc.body.querySelector(calloutSelector)
);
};
const clickPrimaryButton = doc => {
doc.querySelector(".action-buttons .primary").click();
};
add_task(async function feature_callout_renders_in_firefox_view() {
await SpecialPowers.pushPrefEnv({
set: [["browser.firefox-view.feature-tour", "{}"]],
set: [[featureTourPref, "{}"]],
});
await BrowserTestUtils.withNewTab(
@ -60,7 +70,7 @@ add_task(async function feature_callout_renders_in_firefox_view() {
add_task(async function feature_callout_moves_on_screen_change() {
await SpecialPowers.pushPrefEnv({
set: [["browser.firefox-view.feature-tour", "{}"]],
set: [[featureTourPref, "{}"]],
});
await BrowserTestUtils.withNewTab(
@ -104,12 +114,7 @@ add_task(async function feature_callout_moves_on_screen_change() {
add_task(async function feature_callout_is_not_shown_twice() {
// Third comma-separated value of the pref is set to a string value once a user completes the tour
await SpecialPowers.pushPrefEnv({
set: [
[
"browser.firefox-view.feature-tour",
'{"message":"","screen":"","complete":true}',
],
],
set: [[featureTourPref, '{"message":"","screen":"","complete":true}']],
});
await BrowserTestUtils.withNewTab(
@ -130,7 +135,7 @@ add_task(async function feature_callout_is_not_shown_twice() {
add_task(
async function feature_callout_first_screen_positioned_below_element() {
await SpecialPowers.pushPrefEnv({
set: [["browser.firefox-view.feature-tour", "{}"]],
set: [[featureTourPref, "{}"]],
});
await BrowserTestUtils.withNewTab(
@ -161,7 +166,7 @@ add_task(
add_task(
async function feature_callout_second_screen_positioned_above_element() {
await SpecialPowers.pushPrefEnv({
set: [["browser.firefox-view.feature-tour", "{}"]],
set: [[featureTourPref, "{}"]],
});
await BrowserTestUtils.withNewTab(
@ -196,7 +201,7 @@ add_task(
add_task(
async function feature_callout_third_screen_positioned_left_of_element() {
await SpecialPowers.pushPrefEnv({
set: [["browser.firefox-view.feature-tour", "{}"]],
set: [[featureTourPref, "{}"]],
});
await BrowserTestUtils.withNewTab(
@ -234,7 +239,7 @@ add_task(
async function feature_callout_third_screen_position_respects_RTL_layouts() {
await SpecialPowers.pushPrefEnv({
set: [
["browser.firefox-view.feature-tour", "{}"],
[featureTourPref, "{}"],
// Set layout direction to right to left
["intl.l10n.pseudo", "bidi"],
],
@ -277,7 +282,7 @@ add_task(async function feature_callout_syncs_across_visits_and_tabs() {
await SpecialPowers.pushPrefEnv({
set: [
[
"browser.firefox-view.feature-tour",
featureTourPref,
'{"message":"FIREFOX_VIEW_FEATURE_TOUR","screen":"FEATURE_CALLOUT_2","complete":false}',
],
],
@ -319,17 +324,8 @@ add_task(async function feature_callout_syncs_across_visits_and_tabs() {
tab1Doc.querySelector(".action-buttons .primary").click();
await BrowserTestUtils.waitForMutationCondition(
tab1Doc.body,
{ childList: true },
() => !tab1Doc.body.querySelector(calloutSelector)
);
await BrowserTestUtils.waitForMutationCondition(
tab2Doc.body,
{ childList: true },
() => !tab2Doc.body.querySelector(calloutSelector)
);
await waitForCalloutRemoved(tab1Doc);
await waitForCalloutRemoved(tab2Doc);
ok(
!tab1Doc.body.querySelector(calloutSelector),
@ -343,3 +339,37 @@ add_task(async function feature_callout_syncs_across_visits_and_tabs() {
BrowserTestUtils.removeTab(tab1);
BrowserTestUtils.removeTab(tab2);
});
add_task(async function feature_callout_closes_on_dismiss() {
await SpecialPowers.pushPrefEnv({
set: [[featureTourPref, "{}"]],
});
await BrowserTestUtils.withNewTab(
{
gBrowser,
url: "about:firefoxview",
},
async browser => {
const { document } = browser.contentWindow;
await waitForCalloutRender(document);
await waitForCalloutPositioned(document);
document.querySelector(".dismiss-button").click();
await waitForCalloutRemoved(document);
ok(
!document.querySelector(calloutSelector),
"Callout is removed from screen on dismiss"
);
let tourComplete = JSON.parse(
Services.prefs.getStringPref(featureTourPref)
).complete;
ok(
tourComplete,
`Tour is recorded as complete in ${featureTourPref} preference value`
);
}
);
});