diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc index 0d084b7da6da..0cb65811c768 100644 --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -544,7 +544,8 @@ oncommand="openPreferences(undefined, {origin: 'menubar'});"/> #endif #ifdef MOZ_DEBUG - diff --git a/layout/tools/layout-debug/moz.build b/layout/tools/layout-debug/moz.build index 84cb4fb7eb61..3ee14f10b9a6 100644 --- a/layout/tools/layout-debug/moz.build +++ b/layout/tools/layout-debug/moz.build @@ -7,3 +7,5 @@ DIRS += ['src', 'ui'] XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] + +BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini'] diff --git a/layout/tools/layout-debug/tests/browser/browser.ini b/layout/tools/layout-debug/tests/browser/browser.ini new file mode 100644 index 000000000000..b732158dc3fc --- /dev/null +++ b/layout/tools/layout-debug/tests/browser/browser.ini @@ -0,0 +1,2 @@ +[browser_openLayoutDebug.js] +run-if = debug diff --git a/layout/tools/layout-debug/tests/browser/browser_openLayoutDebug.js b/layout/tools/layout-debug/tests/browser/browser_openLayoutDebug.js new file mode 100644 index 000000000000..e37e44216329 --- /dev/null +++ b/layout/tools/layout-debug/tests/browser/browser_openLayoutDebug.js @@ -0,0 +1,39 @@ +"use strict"; + +/* +When run locally this won't test whether the files are packaged and available +in a distributed build unless `./mach mochitest --appname dist` is used +(after `./mach package`) +*/ + +function test() { + waitForExplicitFinish(); + + const windowListener = { + onOpenWindow(win) { + info("Observed window open") + + const domWindow = win.docShell.domWindow; + waitForFocus(() => { + is(domWindow.location, + "chrome://layoutdebug/content/layoutdebug.xul", + "Window location is correct"); + domWindow.close(); + }, domWindow); + }, + + onCloseWindow() { + info("Observed window closed"); + Services.wm.removeListener(this); + finish(); + } + }; + Services.wm.addListener(windowListener); + + const menuitem = document.getElementById("menu_layout_debugger"); + ok(menuitem, "Menuitem present"); + if (menuitem) { + // open the debugger window + menuitem.click(); + } +}