--- a/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js
+++ b/browser/components/customizableui/test/browser_880382_drag_wide_widgets_in_panel.js
@@ -20,17 +20,16 @@ add_task(async function() {
"print-button",
"history-panelmenu",
"fullscreen-button",
"find-button",
"preferences-button",
"add-ons-button",
"developer-button",
"sync-button",
- "webcompat-reporter-button"
];
removeNonReleaseButtons(placementsAfterMove);
simulateItemDrag(zoomControls, printButton);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
let newWindowButton = document.getElementById("new-window-button");
simulateItemDrag(zoomControls, newWindowButton);
ok(CustomizableUI.inDefaultState, "Should be in default state again.");
@@ -49,17 +48,16 @@ add_task(async function() {
"print-button",
"history-panelmenu",
"fullscreen-button",
"find-button",
"preferences-button",
"add-ons-button",
"developer-button",
"sync-button",
- "webcompat-reporter-button"
];
removeNonReleaseButtons(placementsAfterMove);
simulateItemDrag(zoomControls, savePageButton);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
ok(CustomizableUI.inDefaultState, "Should be in default state.");
});
@@ -76,17 +74,16 @@ add_task(async function() {
"print-button",
"history-panelmenu",
"fullscreen-button",
"find-button",
"preferences-button",
"add-ons-button",
"developer-button",
"sync-button",
- "webcompat-reporter-button"
];
removeNonReleaseButtons(placementsAfterMove);
simulateItemDrag(zoomControls, newWindowButton);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
ok(CustomizableUI.inDefaultState, "Should still be in default state.");
});
// Dragging the zoom controls to be before the history-panelmenu should move the zoom-controls in to the row higher than the history-panelmenu.
@@ -102,17 +99,16 @@ add_task(async function() {
"print-button",
"history-panelmenu",
"fullscreen-button",
"find-button",
"preferences-button",
"add-ons-button",
"developer-button",
"sync-button",
- "webcompat-reporter-button"
];
removeNonReleaseButtons(placementsAfterMove);
simulateItemDrag(zoomControls, historyPanelMenu);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
let newWindowButton = document.getElementById("new-window-button");
simulateItemDrag(zoomControls, newWindowButton);
ok(CustomizableUI.inDefaultState, "Should be in default state again.");
@@ -132,17 +128,16 @@ add_task(async function() {
"history-panelmenu",
"fullscreen-button",
"zoom-controls",
"find-button",
"preferences-button",
"add-ons-button",
"developer-button",
"sync-button",
- "webcompat-reporter-button"
];
removeNonReleaseButtons(placementsAfterMove);
simulateItemDrag(zoomControls, preferencesButton);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
let newWindowButton = document.getElementById("new-window-button");
simulateItemDrag(zoomControls, newWindowButton);
ok(CustomizableUI.inDefaultState, "Should be in default state again.");
@@ -162,17 +157,16 @@ add_task(async function() {
"print-button",
"history-panelmenu",
"fullscreen-button",
"find-button",
"preferences-button",
"add-ons-button",
"developer-button",
"sync-button",
- "webcompat-reporter-button"
];
removeNonReleaseButtons(placementsAfterInsert);
simulateItemDrag(openFileButton, zoomControls);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
let palette = document.getElementById("customization-palette");
// Check that the palette items are re-wrapped correctly.
let feedWrapper = document.getElementById("wrapper-feed-button");
@@ -204,17 +198,16 @@ add_task(async function() {
"print-button",
"history-panelmenu",
"fullscreen-button",
"find-button",
"preferences-button",
"add-ons-button",
"developer-button",
"sync-button",
- "webcompat-reporter-button"
];
removeNonReleaseButtons(placementsAfterInsert);
simulateItemDrag(openFileButton, editControls);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterInsert);
ok(!CustomizableUI.inDefaultState, "Should no longer be in default state.");
let palette = document.getElementById("customization-palette");
// Check that the palette items are re-wrapped correctly.
let feedWrapper = document.getElementById("wrapper-feed-button");
@@ -243,17 +236,16 @@ add_task(async function() {
"print-button",
"history-panelmenu",
"fullscreen-button",
"find-button",
"preferences-button",
"add-ons-button",
"developer-button",
"sync-button",
- "webcompat-reporter-button"
];
removeNonReleaseButtons(placementsAfterMove);
simulateItemDrag(editControls, zoomControls);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
ok(CustomizableUI.inDefaultState, "Should still be in default state.");
});
// Dragging the edit-controls to be before the new-window-button should
@@ -270,17 +262,16 @@ add_task(async function() {
"print-button",
"history-panelmenu",
"fullscreen-button",
"find-button",
"preferences-button",
"add-ons-button",
"developer-button",
"sync-button",
- "webcompat-reporter-button"
];
removeNonReleaseButtons(placementsAfterMove);
simulateItemDrag(editControls, newWindowButton);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
let zoomControls = document.getElementById("zoom-controls");
simulateItemDrag(editControls, zoomControls);
ok(CustomizableUI.inDefaultState, "Should still be in default state.");
});
@@ -300,17 +291,16 @@ add_task(async function() {
"print-button",
"history-panelmenu",
"fullscreen-button",
"find-button",
"preferences-button",
"add-ons-button",
"developer-button",
"sync-button",
- "webcompat-reporter-button"
];
removeNonReleaseButtons(placementsAfterMove);
simulateItemDrag(editControls, privateBrowsingButton);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
let zoomControls = document.getElementById("zoom-controls");
simulateItemDrag(editControls, zoomControls);
ok(CustomizableUI.inDefaultState, "Should still be in default state.");
});
@@ -330,17 +320,16 @@ add_task(async function() {
"print-button",
"history-panelmenu",
"fullscreen-button",
"find-button",
"preferences-button",
"add-ons-button",
"developer-button",
"sync-button",
- "webcompat-reporter-button"
];
removeNonReleaseButtons(placementsAfterMove);
simulateItemDrag(editControls, savePageButton);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
let zoomControls = document.getElementById("zoom-controls");
simulateItemDrag(editControls, zoomControls);
ok(CustomizableUI.inDefaultState, "Should still be in default state.");
});
@@ -361,26 +350,20 @@ add_task(async function editControlsToPa
"find-button",
"preferences-button",
"add-ons-button",
"edit-controls",
"developer-button",
"sync-button",
];
removeNonReleaseButtons(placementsAfterMove);
- if (isNotReleaseOrBeta()) {
- CustomizableUI.removeWidgetFromArea("webcompat-reporter-button");
- }
simulateItemDrag(editControls, panel);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
let zoomControls = document.getElementById("zoom-controls");
simulateItemDrag(editControls, zoomControls);
- if (isNotReleaseOrBeta()) {
- CustomizableUI.addWidgetToArea("webcompat-reporter-button", CustomizableUI.AREA_PANEL);
- }
ok(CustomizableUI.inDefaultState, "Should still be in default state.");
});
// Dragging the edit-controls to the customization-palette and
// back should work.
add_task(async function() {
await startCustomizing();
let editControls = document.getElementById("edit-controls");
@@ -392,17 +375,16 @@ add_task(async function() {
"print-button",
"history-panelmenu",
"fullscreen-button",
"find-button",
"preferences-button",
"add-ons-button",
"developer-button",
"sync-button",
- "webcompat-reporter-button",
];
removeNonReleaseButtons(placementsAfterMove);
let paletteChildElementCount = palette.childElementCount;
simulateItemDrag(editControls, palette);
assertAreaPlacements(CustomizableUI.AREA_PANEL, placementsAfterMove);
is(paletteChildElementCount + 1, palette.childElementCount,
"The palette should have a new child, congratulations!");
is(editControls.parentNode.id, "wrapper-edit-controls",
@@ -420,20 +402,20 @@ add_task(async function() {
// should append the edit-controls to the bottom of the panel.
add_task(async function editControlsToPanelPlaceholders() {
await startCustomizing();
let editControls = document.getElementById("edit-controls");
let panel = document.getElementById(CustomizableUI.AREA_PANEL);
let numPlaceholders = 2;
for (let i = 0; i < numPlaceholders; i++) {
// This test relies on there being a specific number of widgets in the
- // panel. The addition of sync-button and webcompat-reporter-button screwed
- // this up, so we remove them here. We should either fix the tests to not
- // rely on the specific layout, or fix bug 1007910 which would change the
- // placeholder logic in different ways. Bug 1229236 is for these tests to
+ // panel. The addition of sync-button screws this up, so we remove it
+ // here. We should either fix the tests to not rely on the specific layout,
+ // or fix bug 1007910 which would change the placeholder logic in
+ // different ways. Bug 1229236 is for these tests to
// be smarter.
removeNonOriginalButtons();
// NB: We can't just iterate over all of the placeholders
// because each drag-drop action recreates them.
let placeholder = panel.getElementsByClassName("panel-customization-placeholder")[i];
let placementsAfterMove = ["zoom-controls",
"new-window-button",
"privatebrowsing-button",
@@ -470,19 +452,19 @@ add_task(async function() {
is(editControls.parentNode.tagName, "toolbarpaletteitem",
"edit-controls should be wrapped by a toolbarpaletteitem");
ok(CustomizableUI.inDefaultState, "Should still be in default state.");
});
// Dragging a small button onto the last big button should work.
add_task(async function() {
// Bug 1007910 requires there be a placeholder on the final row for this
- // test to work as written. The addition of sync-button and
- // webcompat-reporter-button meant that's not true so we remove them from
- // here. Bug 1229236 is for these tests to be smarter.
+ // test to work as written. The addition of sync-button means
+ // that's not true so we remove them from here.
+ // Bug 1229236 is for these tests to be smarter.
removeNonOriginalButtons();
await startCustomizing();
let editControls = document.getElementById("edit-controls");
let panel = document.getElementById(CustomizableUI.AREA_PANEL);
let target = panel.getElementsByClassName("panel-customization-placeholder")[0];
let placementsAfterMove = ["zoom-controls",
"new-window-button",
"privatebrowsing-button",