corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1926254 - Esc key should cancel rather than accept the tab group create panel. r=sthompson,tabbrowser-reviewers

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D233185
This commit is contained in:
Dão Gottwald
2025-01-03 17:15:50 +00:00
parent 899b3c4127
commit e9e9d3a05a
2 changed files with 115 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
browser/components/tabbrowser/test/browser/tabs/browser_tab_groups.js
View File

@@ -16,6 +16,16 @@ function createManyTabs(number) {
});
}
async function waitForAndAcceptGroupPanel(actionCallback) {
let tabgroupPanel = document.getElementById("tab-group-editor").panel;
let panelShown = BrowserTestUtils.waitForPopupEvent(tabgroupPanel, "shown");
let panelHidden = BrowserTestUtils.waitForPopupEvent(tabgroupPanel, "hidden");
await actionCallback();
await panelShown;
EventUtils.synthesizeKey("VK_RETURN");
await panelHidden;
}
add_task(async function test_tabGroupCreateAndAddTab() {
let tab1 = BrowserTestUtils.addTab(gBrowser, "about:blank");
let group = gBrowser.addTabGroup([tab1]);
@@ -711,16 +721,22 @@ add_task(async function test_tabGroupContextMenuMoveTabToNewGroup() {
skipAnimation: true,
});
await withTabMenu(tab, async (moveTabToNewGroupItem, moveTabToGroupItem) => {
Assert.equal(tab.group, null, "tab is not in group");
Assert.ok(
!moveTabToNewGroupItem.hidden,
"moveTabToNewGroupItem is visible"
);
Assert.ok(moveTabToGroupItem.hidden, "moveTabToGroupItem is hidden");
await waitForAndAcceptGroupPanel(
async () =>
await withTabMenu(
tab,
async (moveTabToNewGroupItem, moveTabToGroupItem) => {
Assert.equal(tab.group, null, "tab is not in group");
Assert.ok(
!moveTabToNewGroupItem.hidden,
"moveTabToNewGroupItem is visible"
);
Assert.ok(moveTabToGroupItem.hidden, "moveTabToGroupItem is hidden");
moveTabToNewGroupItem.click();
});
moveTabToNewGroupItem.click();
}
)
);
Assert.ok(tab.group, "tab is in group");
Assert.equal(tab.group.label, "", "tab group label is empty");
@@ -750,17 +766,26 @@ add_task(async function test_tabGroupContextMenuMoveTabsToNewGroup() {
let tabToClick = tabs[2];
await withTabMenu(
tabToClick,
async (moveTabToNewGroupItem, moveTabToGroupItem) => {
Assert.ok(
!moveTabToNewGroupItem.hidden,
"moveTabToNewGroupItem is visible"
);
Assert.ok(moveTabToGroupItem.hidden, "moveTabToGroupItem is hidden");
await waitForAndAcceptGroupPanel(
async () =>
await waitForAndAcceptGroupPanel(
async () =>
await withTabMenu(
tabToClick,
async (moveTabToNewGroupItem, moveTabToGroupItem) => {
Assert.ok(
!moveTabToNewGroupItem.hidden,
"moveTabToNewGroupItem is visible"
);
Assert.ok(
moveTabToGroupItem.hidden,
"moveTabToGroupItem is hidden"
);
moveTabToNewGroupItem.click();
}
moveTabToNewGroupItem.click();
}
)
)
);
let group = tabs[0].group;
@@ -791,22 +816,28 @@ add_task(
EventUtils.synthesizeMouseAtCenter(otherTab, {});
await withTabMenu(
tab,
async (moveTabToNewGroupItem, moveTabToGroupItem) => {
Assert.equal(
gBrowser.selectedTabs.includes(TabContextMenu.contextTab),
false,
"context menu tab is not selected"
);
Assert.ok(
!moveTabToNewGroupItem.hidden,
"moveTabToNewGroupItem is visible"
);
Assert.ok(moveTabToGroupItem.hidden, "moveTabToGroupItem is hidden");
await waitForAndAcceptGroupPanel(
async () =>
await withTabMenu(
tab,
async (moveTabToNewGroupItem, moveTabToGroupItem) => {
Assert.equal(
gBrowser.selectedTabs.includes(TabContextMenu.contextTab),
false,
"context menu tab is not selected"
);
Assert.ok(
!moveTabToNewGroupItem.hidden,
"moveTabToNewGroupItem is visible"
);
Assert.ok(
moveTabToGroupItem.hidden,
"moveTabToGroupItem is hidden"
);
moveTabToNewGroupItem.click();
}
moveTabToNewGroupItem.click();
}
)
);
Assert.ok(tab.group, "tab is in group");
@@ -839,22 +870,28 @@ add_task(
);
});
await withTabMenu(
tab,
async (moveTabToNewGroupItem, moveTabToGroupItem) => {
Assert.equal(
gBrowser.selectedTabs.includes(TabContextMenu.contextTab),
false,
"context menu tab is not selected"
);
Assert.ok(
!moveTabToNewGroupItem.hidden,
"moveTabToNewGroupItem is visible"
);
Assert.ok(moveTabToGroupItem.hidden, "moveTabToGroupItem is hidden");
await waitForAndAcceptGroupPanel(
async () =>
await withTabMenu(
tab,
async (moveTabToNewGroupItem, moveTabToGroupItem) => {
Assert.equal(
gBrowser.selectedTabs.includes(TabContextMenu.contextTab),
false,
"context menu tab is not selected"
);
Assert.ok(
!moveTabToNewGroupItem.hidden,
"moveTabToNewGroupItem is visible"
);
Assert.ok(
moveTabToGroupItem.hidden,
"moveTabToGroupItem is hidden"
);
moveTabToNewGroupItem.click();
}
moveTabToNewGroupItem.click();
}
)
);
Assert.ok(tab.group, "tab is in group");
@@ -978,9 +1015,14 @@ add_task(async function test_tabGroupContextMenuMoveTabToGroupNewGroup() {
skipAnimation: true,
});
await withTabMenu(tab, async (_, moveTabToGroupItem) => {
moveTabToGroupItem.querySelector("#context_moveTabToGroupNewGroup").click();
});
await waitForAndAcceptGroupPanel(
async () =>
await withTabMenu(tab, async (_, moveTabToGroupItem) => {
moveTabToGroupItem
.querySelector("#context_moveTabToGroupNewGroup")
.click();
})
);
Assert.ok(tab.group, "tab is in group");
Assert.notEqual(
@@ -1536,6 +1578,12 @@ add_task(async function test_tabGroupCreatePanel() {
await panelHidden;
Assert.ok(!tab.group, "Tab is ungrouped after hitting Cancel");
// Group should be removed after hitting Esc
panelHidden = BrowserTestUtils.waitForPopupEvent(tabgroupPanel, "hidden");
EventUtils.synthesizeKey("KEY_Escape");
await panelHidden;
Assert.ok(!tab.group, "Tab is ungrouped after hitting Esc");
panelShown = BrowserTestUtils.waitForPopupEvent(tabgroupPanel, "shown");
group = gBrowser.addTabGroup([tab], {
color: "cyan",