Backed out changeset 4ec21bd0926f (bug 1446274) for browser_ext_browserAction_popup_resize.js failures. DEVEDITION_62_0b18_BUILD1 DEVEDITION_62_0b18_RELEASE FIREFOX_62_0b18_BUILD1 FIREFOX_62_0b18_RELEASE
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 16 Aug 2018 11:17:33 -0400
changeset 478467 5d1304c8f20a6602a93176ec772075df7ac38d32
parent 478466 8ad88c2fad5cb9d2c984add1ef3d6902c02c204e
child 478468 47b9b4078b7c37f1e193274c4059b6adaf702e24
push id9677
push userryanvm@gmail.com
push dateThu, 16 Aug 2018 15:17:50 +0000
treeherdermozilla-beta@5d1304c8f20a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1446274
milestone62.0
backs out4ec21bd0926f44934a4b72e7c38fedf341ba6064
Backed out changeset 4ec21bd0926f (bug 1446274) for browser_ext_browserAction_popup_resize.js failures.
browser/components/extensions/test/browser/browser_ext_browserAction_popup_resize.js
--- a/browser/components/extensions/test/browser/browser_ext_browserAction_popup_resize.js
+++ b/browser/components/extensions/test/browser/browser_ext_browserAction_popup_resize.js
@@ -3,20 +3,16 @@
 "use strict";
 
 function openPanel(extension, win = window, awaitLoad = false) {
   clickBrowserAction(extension, win);
 
   return awaitExtensionPanel(extension, win, awaitLoad);
 }
 
-add_task(async function testSetup() {
-  Services.prefs.setBoolPref("toolkit.cosmeticAnimations.enabled", false);
-});
-
 add_task(async function testBrowserActionPopupResize() {
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "browser_action": {
         "default_popup": "popup.html",
         "browser_style": true,
       },
     },
@@ -62,16 +58,20 @@ add_task(async function testBrowserActio
   }
 
   await closeBrowserAction(extension);
   await extension.unload();
 });
 
 async function testPopupSize(standardsMode, browserWin = window, arrowSide = "top") {
   let docType = standardsMode ? "<!DOCTYPE html>" : "";
+  let overflowView = browserWin.document.getElementById("widget-overflow-mainView");
+  if (overflowView) {
+    overflowView.style.minHeight = "600px";
+  }
 
   let extension = ExtensionTestUtils.loadExtension({
     manifest: {
       "browser_action": {
         "default_popup": "popup.html",
         "browser_style": false,
       },
     },
@@ -148,18 +148,16 @@ async function testPopupSize(standardsMo
   }
 
 
   // Test the PanelUI panel for a menu panel button.
   let widget = getBrowserActionWidget(extension);
   CustomizableUI.addWidgetToArea(widget.id, getCustomizableUIPanelID());
 
   let panel = browserWin.PanelUI.overflowPanel;
-  panel.setAttribute("animate", "false");
-
   let panelMultiView = panel.firstChild;
   let widgetId = makeWidgetId(extension.id);
   // The 'ViewShown' event is the only way to correctly determine when the extensions'
   // panelview has finished transitioning and is fully in view.
   let shownPromise = BrowserTestUtils.waitForEvent(panelMultiView, "ViewShown",
                                                    e => (e.originalTarget.id || "").includes(widgetId));
   let browser = await openPanel(extension, browserWin);
   let origPanelRect = panel.getBoundingClientRect();
@@ -182,17 +180,16 @@ async function testPopupSize(standardsMo
 
       let panelTop = browserWin.mozInnerScreenY + panelRect.top;
       ok(panelTop >= browserWin.screen.availTop, `Top of popup should be on-screen. (${panelTop} >= ${browserWin.screen.availTop})`);
     }
   };
 
   await awaitBrowserLoaded(browser);
   await shownPromise;
-
   // Wait long enough to make sure the initial resize debouncing timer has
   // expired.
   await delay(500);
 
   let dims = await promiseContentDimensions(browser);
 
   is(dims.isStandards, standardsMode, "Document has the expected compat mode");
 
@@ -267,16 +264,19 @@ async function testPopupSize(standardsMo
   is(win.innerWidth, innerWidth, "Window width should not change");
   is(win.innerHeight, innerHeight, "Window height should return to its original value");
   Assert.lessOrEqual(win.scrollMaxY, 1, "Document should not be vertically scrollable");
 
   checkPanelPosition();
 
   await closeBrowserAction(extension, browserWin);
 
+  if (overflowView) {
+    overflowView.style.removeProperty("min-height");
+  }
   await extension.unload();
 }
 
 add_task(async function testBrowserActionMenuResizeStandards() {
   await testPopupSize(true);
 });
 
 add_task(async function testBrowserActionMenuResizeQuirks() {
@@ -311,12 +311,8 @@ add_task(async function testBrowserActio
   }
 
   await SimpleTest.promiseFocus(win);
 
   await testPopupSize(true, win, "bottom");
 
   await BrowserTestUtils.closeWindow(win);
 });
-
-add_task(async function testTeardown() {
-  Services.prefs.clearUserPref("toolkit.cosmeticAnimations.enabled");
-});