Bug 1530983 - Move browser_bookmark_popup/titles.js to browser/components/places and fix them for running with QuantumBar. r=mak
authorMark Banner <standard8@mozilla.com>
Wed, 27 Feb 2019 16:08:59 +0000
changeset 519350 7faa9b2768ed41c88088b9ecd58b89fb0101a5cd
parent 519349 e4e4e4a15fc124878f9dab7298350661afb7238d
child 519351 94fb56d47147bea9bb6cd05bb20c1a9fe8ee7066
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1530983
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1530983 - Move browser_bookmark_popup/titles.js to browser/components/places and fix them for running with QuantumBar. r=mak Differential Revision: https://phabricator.services.mozilla.com/D21347
browser/base/content/test/general/browser.ini
browser/base/content/test/general/browser_bookmark_popup.js
browser/base/content/test/general/browser_bookmark_titles.js
browser/components/places/tests/browser/browser.ini
browser/components/places/tests/browser/browser_bookmark_popup.js
browser/components/places/tests/browser/browser_bookmark_titles.js
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -71,21 +71,16 @@ support-files =
 [browser_alltabslistener.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_backButtonFitts.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_beforeunload_duplicate_dialogs.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_blob-channelname.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
-[browser_bookmark_popup.js]
-skip-if = (os == "linux" && debug) || (verify && (os == 'win')) # mouseover not reliable on linux debug builds
-# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
-[browser_bookmark_titles.js]
-# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug321000.js]
 subsuite = clipboard
 skip-if = true # browser_bug321000.js is disabled because newline handling is shaky (bug 592528)
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug356571.js]
 skip-if = (verify && !debug && (os == 'win'))
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_bug380960.js]
--- a/browser/components/places/tests/browser/browser.ini
+++ b/browser/components/places/tests/browser/browser.ini
@@ -12,19 +12,23 @@ support-files =
   keyword_form.html
 
 [browser_addBookmarkForFrame.js]
 skip-if = (verify && debug)
 [browser_bookmark_add_tags.js]
 [browser_bookmark_backup_export_import.js]
 [browser_bookmark_change_location.js]
 [browser_bookmark_folder_moveability.js]
+[browser_bookmark_popup.js]
+skip-if = (os == "linux" && debug) || (verify && (os == 'win')) # mouseover not reliable on linux debug builds
 [browser_bookmark_private_window.js]
 skip-if = (verify && debug && (os == 'win' || os == 'mac'))
 [browser_bookmark_remove_tags.js]
+[browser_bookmark_titles.js]
+support-files = ../../../../base/content/test/general/dummy_page.html
 [browser_bookmarklet_windowOpen.js]
 support-files =
   bookmarklet_windowOpen_dummy.html
 [browser_bookmarkMenu_hiddenWindow.js]
 skip-if = os != 'mac' # Mac-only functionality
 [browser_bookmarks_change_title.js]
 [browser_bookmarks_sidebar_search.js]
 support-files =
rename from browser/base/content/test/general/browser_bookmark_popup.js
rename to browser/components/places/tests/browser/browser_bookmark_popup.js
--- a/browser/base/content/test/general/browser_bookmark_popup.js
+++ b/browser/components/places/tests/browser/browser_bookmark_popup.js
@@ -24,17 +24,17 @@ add_task(async function setup() {
   registerCleanupFunction(() => {
     bookmarkPanel.removeAttribute("animate");
   });
 });
 
 function mouseout() {
   let mouseOutPromise = BrowserTestUtils.waitForEvent(bookmarkPanel, "mouseout");
   EventUtils.synthesizeMouse(bookmarkPanel, 0, 0, {type: "mouseout"});
-  EventUtils.synthesizeMouseAtCenter(gURLBar, {type: "mousemove"});
+  EventUtils.synthesizeMouseAtCenter(gURLBar.textbox, {type: "mousemove"});
   info("Waiting for mouseout event");
   return mouseOutPromise;
 }
 
 async function test_bookmarks_popup({isNewBookmark, popupShowFn, popupEditFn,
                                 shouldAutoClose, popupHideFn, isBookmarkRemoved}) {
   await BrowserTestUtils.withNewTab({gBrowser, url: TEST_URL}, async function(browser) {
     try {
rename from browser/base/content/test/general/browser_bookmark_titles.js
rename to browser/components/places/tests/browser/browser_bookmark_titles.js
--- a/browser/base/content/test/general/browser_bookmark_titles.js
+++ b/browser/components/places/tests/browser/browser_bookmark_titles.js
@@ -1,17 +1,17 @@
 /* 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/. */
 
 // This file is tests for the default titles that new bookmarks get.
 
 var tests = [
   // Common page.
-  ["http://example.com/browser/browser/base/content/test/general/dummy_page.html",
+  ["http://example.com/browser/browser/components/places/tests/browser/dummy_page.html",
    "Dummy test page"],
   // Data URI.
   ["data:text/html;charset=utf-8,<title>test%20data:%20url</title>",
    "test data: url"],
   // about:neterror
   ["data:application/vnd.mozilla.xul+xml,",
    "data:application/vnd.mozilla.xul+xml,"],
   // about:certerror