diff --git a/browser/components/customizableui/test/browser.ini b/browser/components/customizableui/test/browser.ini index 7026b861f4d..c049ba87afd 100644 --- a/browser/components/customizableui/test/browser.ini +++ b/browser/components/customizableui/test/browser.ini @@ -65,19 +65,6 @@ skip-if = e10s # Bug ?????? - test uses promiseTabLoadEvent() which isn't e10s f [browser_943683_migration_test.js] [browser_944887_destroyWidget_should_destroy_in_palette.js] [browser_945739_showInPrivateBrowsing_customize_mode.js] -[browser_947914_button_addons.js] -[browser_947914_button_copy.js] -[browser_947914_button_cut.js] -[browser_947914_button_find.js] -[browser_947914_button_history.js] -[browser_947914_button_newPrivateWindow.js] -[browser_947914_button_newWindow.js] -[browser_947914_button_paste.js] -[browser_947914_button_print.js] -[browser_947914_button_savePage.js] -[browser_947914_button_zoomIn.js] -[browser_947914_button_zoomOut.js] -[browser_947914_button_zoomReset.js] [browser_947987_removable_default.js] [browser_948985_non_removable_defaultArea.js] [browser_952963_areaType_getter_no_area.js] diff --git a/browser/components/customizableui/test/browser_947914_button_addons.js b/browser/components/customizableui/test/browser_947914_button_addons.js deleted file mode 100644 index 9ee8d27a6a2..00000000000 --- a/browser/components/customizableui/test/browser_947914_button_addons.js +++ /dev/null @@ -1,34 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -add_task(function() { - info("Check addons button existence and functionality"); - - let initialLocation = gBrowser.currentURI.spec; - - yield PanelUI.show(); - - let addonsButton = document.getElementById("add-ons-button"); - ok(addonsButton, "Add-ons button exists in Panel Menu"); - addonsButton.click(); - - yield waitForCondition(function() gBrowser.currentURI && - gBrowser.currentURI.spec == "about:addons"); - - let addonsPage = gBrowser.selectedBrowser.contentWindow.document. - getElementById("addons-page"); - ok(addonsPage, "Add-ons page was opened"); - - // close the add-ons tab - if(gBrowser.tabs.length > 1) { - gBrowser.removeTab(gBrowser.selectedTab); - } - else { - var tabToRemove = gBrowser.selectedTab; - gBrowser.addTab(initialLocation); - gBrowser.removeTab(tabToRemove); - } -}); diff --git a/browser/components/customizableui/test/browser_947914_button_copy.js b/browser/components/customizableui/test/browser_947914_button_copy.js deleted file mode 100644 index dde2391ebb8..00000000000 --- a/browser/components/customizableui/test/browser_947914_button_copy.js +++ /dev/null @@ -1,51 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -add_task(function() { - info("Check copy button existence and functionality"); - - var testText = "copy text test"; - let initialLocation = gBrowser.currentURI.spec; - - yield PanelUI.show(); - - let copyButton = document.getElementById("copy-button"); - ok(copyButton, "Copy button exists in Panel Menu"); - is(copyButton.getAttribute("disabled"), "true", "Copy button is initially disabled"); - - // copy text from URL bar - gURLBar.value = testText; - gURLBar.focus(); - gURLBar.select(); - yield PanelUI.show(); - - ok(!copyButton.hasAttribute("disabled"), "Copy button gets enabled"); - - copyButton.click(); - is(gURLBar.value, testText, "Selected text is unaltered when clicking copy"); - - // check that the text was added to the clipboard - let clipboard = Services.clipboard; - let transferable = Cc["@mozilla.org/widget/transferable;1"].createInstance(Ci.nsITransferable); - const globalClipboard = clipboard.kGlobalClipboard; - - transferable.init(null); - transferable.addDataFlavor("text/unicode"); - clipboard.getData(transferable, globalClipboard); - let str = {}, strLength = {}; - transferable.getTransferData("text/unicode", str, strLength); - let clipboardValue = ""; - - if (str.value) { - str.value.QueryInterface(Ci.nsISupportsString); - clipboardValue = str.value.data; - } - is(clipboardValue, testText, "Data was copied to the clipboard."); - - // restore the tab location and clear the clipboard - Services.clipboard.emptyClipboard(globalClipboard); - gURLBar.value = initialLocation; -}); diff --git a/browser/components/customizableui/test/browser_947914_button_cut.js b/browser/components/customizableui/test/browser_947914_button_cut.js deleted file mode 100644 index cc404e514a6..00000000000 --- a/browser/components/customizableui/test/browser_947914_button_cut.js +++ /dev/null @@ -1,50 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -add_task(function() { - info("Check cut button existence and functionality"); - - var testText = "cut text test"; - let initialLocation = gBrowser.currentURI.spec; - - yield PanelUI.show(); - - let cutButton = document.getElementById("cut-button"); - ok(cutButton, "Cut button exists in Panel Menu"); - ok(cutButton.getAttribute("disabled"), "Cut button is disabled"); - - // cut text from URL bar - gURLBar.value = testText; - gURLBar.focus(); - gURLBar.select(); - yield PanelUI.show(); - - ok(!cutButton.hasAttribute("disabled"), "Cut button gets enabled"); - cutButton.click(); - is(gURLBar.value, "", "Selected text is removed from source when clicking on cut"); - - // check that the text was added to the clipboard - let clipboard = Services.clipboard; - let transferable = Cc["@mozilla.org/widget/transferable;1"].createInstance(Ci.nsITransferable); - const globalClipboard = clipboard.kGlobalClipboard; - - transferable.init(null); - transferable.addDataFlavor("text/unicode"); - clipboard.getData(transferable, globalClipboard); - let str = {}, strLength = {}; - transferable.getTransferData("text/unicode", str, strLength); - let clipboardValue = ""; - - if (str.value) { - str.value.QueryInterface(Ci.nsISupportsString); - clipboardValue = str.value.data; - } - is(clipboardValue, testText, "Data was copied to the clipboard."); - - // restore the tab location and clear the clipboard - gBrowser.value = initialLocation; - Services.clipboard.emptyClipboard(globalClipboard); -}); diff --git a/browser/components/customizableui/test/browser_947914_button_find.js b/browser/components/customizableui/test/browser_947914_button_find.js deleted file mode 100644 index 8c766bb5fe8..00000000000 --- a/browser/components/customizableui/test/browser_947914_button_find.js +++ /dev/null @@ -1,20 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -add_task(function() { - info("Check find button existence and functionality"); - - yield PanelUI.show(); - - let findButton = document.getElementById("find-button"); - ok(findButton, "Find button exists in Panel Menu"); - - findButton.click(); - ok(!gFindBar.hasAttribute("hidden"), "Findbar opened successfully"); - - // close find bar - gFindBar.close(); -}); diff --git a/browser/components/customizableui/test/browser_947914_button_history.js b/browser/components/customizableui/test/browser_947914_button_history.js deleted file mode 100644 index e286ab4273e..00000000000 --- a/browser/components/customizableui/test/browser_947914_button_history.js +++ /dev/null @@ -1,22 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -add_task(function() { - info("Check history button existence and functionality"); - - yield PanelUI.show(); - - let historyButton = document.getElementById("history-panelmenu"); - ok(historyButton, "History button appears in Panel Menu"); - - historyButton.click(); - let historyPanel = document.getElementById("PanelUI-history"); - ok(historyPanel.getAttribute("current"), "History Panel is in view"); - - let panelHiddenPromise = promisePanelHidden(window); - PanelUI.hide(); - yield panelHiddenPromise -}); diff --git a/browser/components/customizableui/test/browser_947914_button_newPrivateWindow.js b/browser/components/customizableui/test/browser_947914_button_newPrivateWindow.js deleted file mode 100644 index a4e9e10e67a..00000000000 --- a/browser/components/customizableui/test/browser_947914_button_newPrivateWindow.js +++ /dev/null @@ -1,45 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -add_task(function() { - info("Check private browsing button existence and functionality"); - yield PanelUI.show(); - - var windowWasHandled = false; - let privateWindow = null; - - let observerWindowOpened = { - observe: function(aSubject, aTopic, aData) { - if (aTopic == "domwindowopened") { - privateWindow = aSubject.QueryInterface(Components.interfaces.nsIDOMWindow); - privateWindow.addEventListener("load", function newWindowHandler() { - privateWindow.removeEventListener("load", newWindowHandler, false); - is(privateWindow.location.href, "chrome://browser/content/browser.xul", - "A new browser window was opened"); - ok(PrivateBrowsingUtils.isWindowPrivate(privateWindow), "Window is private"); - windowWasHandled = true; - }, false); - } - } - } - - Services.ww.registerNotification(observerWindowOpened); - - let privateBrowsingButton = document.getElementById("privatebrowsing-button"); - ok(privateBrowsingButton, "Private browsing button exists in Panel Menu"); - privateBrowsingButton.click(); - - try{ - yield waitForCondition(() => windowWasHandled); - yield promiseWindowClosed(privateWindow); - } - catch(e) { - ok(false, "The new private browser window was not properly handled"); - } - finally { - Services.ww.unregisterNotification(observerWindowOpened); - } -}); diff --git a/browser/components/customizableui/test/browser_947914_button_newWindow.js b/browser/components/customizableui/test/browser_947914_button_newWindow.js deleted file mode 100644 index 57c2581740c..00000000000 --- a/browser/components/customizableui/test/browser_947914_button_newWindow.js +++ /dev/null @@ -1,45 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -add_task(function() { - info("Check new window button existence and functionality"); - yield PanelUI.show(); - - var windowWasHandled = false; - var newWindow = null; - - let observerWindowOpened = { - observe: function(aSubject, aTopic, aData) { - if (aTopic == "domwindowopened") { - newWindow = aSubject.QueryInterface(Components.interfaces.nsIDOMWindow); - newWindow.addEventListener("load", function newWindowHandler() { - newWindow.removeEventListener("load", newWindowHandler, false); - is(newWindow.location.href, "chrome://browser/content/browser.xul", - "A new browser window was opened"); - ok(!PrivateBrowsingUtils.isWindowPrivate(newWindow), "Window is not private"); - windowWasHandled = true; - }, false); - } - } - } - - Services.ww.registerNotification(observerWindowOpened); - - let newWindowButton = document.getElementById("new-window-button"); - ok(newWindowButton, "New Window button exists in Panel Menu"); - newWindowButton.click(); - - try{ - yield waitForCondition(() => windowWasHandled); - yield promiseWindowClosed(newWindow); - } - catch(e) { - ok(false, "The new browser window was not properly handled"); - } - finally { - Services.ww.unregisterNotification(observerWindowOpened); - } -}); diff --git a/browser/components/customizableui/test/browser_947914_button_paste.js b/browser/components/customizableui/test/browser_947914_button_paste.js deleted file mode 100644 index 8895c812ab5..00000000000 --- a/browser/components/customizableui/test/browser_947914_button_paste.js +++ /dev/null @@ -1,35 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -add_task(function() { - info("Check paste button existence and functionality"); - - let initialLocation = gBrowser.currentURI.spec; - let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper); - const globalClipboard = Services.clipboard.kGlobalClipboard; - - yield PanelUI.show(); - - let pasteButton = document.getElementById("paste-button"); - ok(pasteButton, "Paste button exists in Panel Menu"); - - // add text to clipboard - var text = "Sample text for testing"; - clipboard.copyString(text); - - // test paste button by pasting text to URL bar - gURLBar.focus(); - yield PanelUI.show(); - - ok(!pasteButton.hasAttribute("disabled"), "Paste button is enabled"); - pasteButton.click(); - - is(gURLBar.value, text, "Text pasted successfully"); - - // clear the clipboard and restore the tab location as it was at the begining of the test - Services.clipboard.emptyClipboard(globalClipboard); - gURLBar.value = initialLocation; -}); diff --git a/browser/components/customizableui/test/browser_947914_button_print.js b/browser/components/customizableui/test/browser_947914_button_print.js deleted file mode 100644 index e4b7e9dac33..00000000000 --- a/browser/components/customizableui/test/browser_947914_button_print.js +++ /dev/null @@ -1,32 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -const isOSX = (Services.appinfo.OS === "Darwin"); - -add_task(function() { - info("Check print button existence and functionality"); - - yield PanelUI.show(); - - let printButton = document.getElementById("print-button"); - ok(printButton, "Print button exists in Panel Menu"); - - if(isOSX) { - let panelHiddenPromise = promisePanelHidden(window); - PanelUI.hide(); - yield panelHiddenPromise; - } - else { - printButton.click(); - yield waitForCondition(() => window.gInPrintPreviewMode); - - ok(window.gInPrintPreviewMode, "Entered print preview mode"); - - // close print preview - PrintUtils.exitPrintPreview(); - yield waitForCondition(() => !window.gInPrintPreviewMode); - } -}); diff --git a/browser/components/customizableui/test/browser_947914_button_savePage.js b/browser/components/customizableui/test/browser_947914_button_savePage.js deleted file mode 100644 index 4cc7de86fc6..00000000000 --- a/browser/components/customizableui/test/browser_947914_button_savePage.js +++ /dev/null @@ -1,18 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -add_task(function() { - info("Check save page button existence"); - - yield PanelUI.show(); - - let savePageButton = document.getElementById("save-page-button"); - ok(savePageButton, "Save Page button exists in Panel Menu"); - - let panelHiddenPromise = promisePanelHidden(window); - PanelUI.hide(); - yield panelHiddenPromise; -}); diff --git a/browser/components/customizableui/test/browser_947914_button_zoomIn.js b/browser/components/customizableui/test/browser_947914_button_zoomIn.js deleted file mode 100644 index 9ec48646ca8..00000000000 --- a/browser/components/customizableui/test/browser_947914_button_zoomIn.js +++ /dev/null @@ -1,31 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -add_task(function() { - info("Check zoom in button existence and functionality"); - - let initialPageZoom = ZoomManager.zoom; - is(initialPageZoom, 1, "Initial zoom factor should be 1"); - - yield PanelUI.show(); - - let zoomInButton = document.getElementById("zoom-in-button"); - ok(zoomInButton, "Zoom in button exists in Panel Menu"); - - zoomInButton.click(); - let pageZoomLevel = parseInt(ZoomManager.zoom * 100); - let zoomResetButton = document.getElementById("zoom-reset-button"); - let expectedZoomLevel = parseInt(zoomResetButton.getAttribute("label"), 10); - ok(pageZoomLevel > 100 && pageZoomLevel == expectedZoomLevel, "Page zoomed in correctly"); - - // close the Panel - let panelHiddenPromise = promisePanelHidden(window); - PanelUI.hide(); - yield panelHiddenPromise; - - // reset zoom level - ZoomManager.zoom = initialPageZoom; -}); diff --git a/browser/components/customizableui/test/browser_947914_button_zoomOut.js b/browser/components/customizableui/test/browser_947914_button_zoomOut.js deleted file mode 100644 index 468874b2190..00000000000 --- a/browser/components/customizableui/test/browser_947914_button_zoomOut.js +++ /dev/null @@ -1,32 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -add_task(function() { - info("Check zoom out button existence and functionality"); - - let initialPageZoom = ZoomManager.zoom; - is(initialPageZoom, 1, "Initial zoom factor should be 1"); - - yield PanelUI.show(); - - let zoomOutButton = document.getElementById("zoom-out-button"); - ok(zoomOutButton, "Zoom out button exists in Panel Menu"); - - zoomOutButton.click(); - let pageZoomLevel = Math.round(ZoomManager.zoom*100); - - let zoomResetButton = document.getElementById("zoom-reset-button"); - let expectedZoomLevel = parseInt(zoomResetButton.getAttribute("label"), 10); - ok(pageZoomLevel < 100 && pageZoomLevel == expectedZoomLevel, "Page zoomed out correctly"); - - // close the panel - let panelHiddenPromise = promisePanelHidden(window); - PanelUI.hide(); - yield panelHiddenPromise; - - // reset zoom level - ZoomManager.zoom = initialPageZoom; -}); diff --git a/browser/components/customizableui/test/browser_947914_button_zoomReset.js b/browser/components/customizableui/test/browser_947914_button_zoomReset.js deleted file mode 100644 index 8898f4fb990..00000000000 --- a/browser/components/customizableui/test/browser_947914_button_zoomReset.js +++ /dev/null @@ -1,30 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -"use strict"; - -add_task(function() { - info("Check zoom reset button existence and functionality"); - - let initialPageZoom = ZoomManager.zoom; - is(initialPageZoom, 1, "Initial zoom factor should be 1"); - ZoomManager.zoom = 0.5; - yield PanelUI.show(); - - let zoomResetButton = document.getElementById("zoom-reset-button"); - ok(zoomResetButton, "Zoom reset button exists in Panel Menu"); - - zoomResetButton.click(); - let pageZoomLevel = parseInt(ZoomManager.zoom * 100); - let expectedZoomLevel = parseInt(zoomResetButton.getAttribute("label"), 10); - ok(pageZoomLevel == expectedZoomLevel && pageZoomLevel == 100, "Page zoom reset correctly"); - - // close the panel - let panelHiddenPromise = promisePanelHidden(window); - PanelUI.hide(); - yield panelHiddenPromise; - - //reset the zoom level - ZoomManager.zoom = initialPageZoom; -});