Bug 1541432: Move browser_keyword* tests from browser/base/content/test/general to browser/components/urlbar. r=Standard8
authorSyeda Asra Arshia Qadri <asra.qadri@gmail.com>
Thu, 11 Apr 2019 13:37:48 +0000
changeset 469003 10c226df417e96f7d1127d023b72e701586dfe64
parent 469002 5207719835cc7619e481be3ddf85f2fe0b763917
child 469004 7899601d5d70ba39e13ec3332e6b7f145b4719c6
push id35856
push usercsabou@mozilla.com
push dateFri, 12 Apr 2019 03:19:48 +0000
treeherdermozilla-central@940684cd1065 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs1541432
milestone68.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 1541432: Move browser_keyword* tests from browser/base/content/test/general to browser/components/urlbar. r=Standard8 Differential Revision: https://phabricator.services.mozilla.com/D26895
browser/base/content/test/general/POSTSearchEngine.xml
browser/base/content/test/general/browser.ini
browser/base/content/test/general/browser_keywordBookmarklets.js
browser/base/content/test/general/browser_keywordSearch.js
browser/base/content/test/general/browser_keywordSearch_postData.js
browser/components/urlbar/tests/browser/POSTSearchEngine.xml
browser/components/urlbar/tests/browser/browser.ini
browser/components/urlbar/tests/browser/browser_keywordBookmarklets.js
browser/components/urlbar/tests/browser/browser_keywordSearch.js
browser/components/urlbar/tests/browser/browser_keywordSearch_postData.js
browser/components/urlbar/tests/legacy/browser.ini
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -3,17 +3,16 @@
 # TRY ONE OF THE MORE TOPICAL SIBLING DIRECTORIES.                            #
 # THIS DIRECTORY HAS 200+ TESTS AND TAKES AGES TO RUN ON A DEBUG BUILD.       #
 # PLEASE, FOR THE LOVE OF WHATEVER YOU HOLD DEAR, DO NOT ADD MORE TESTS HERE. #
 ###############################################################################
 
 [DEFAULT]
 prefs = browser.cache.offline.insecure.enable=true
 support-files =
-  POSTSearchEngine.xml
   alltabslistener.html
   app_bug575561.html
   app_subframe_bug575561.html
   audio.ogg
   browser_bug479408_sample.html
   browser_bug970746.xhtml
   browser_star_hsts.sjs
   browser_tab_dragdrop2_frame1.xul
@@ -290,23 +289,16 @@ skip-if = os == "linux" # Linux: Intermi
 skip-if = e10s # Bug 863514 - no gesture support.
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_hide_removing.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_homeDrop.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_invalid_uri_back_forward_manipulation.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
-[browser_keywordBookmarklets.js]
-# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
-[browser_keywordSearch.js]
-# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
-[browser_keywordSearch_postData.js]
-uses-unsafe-cpows = true
-# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_lastAccessedTab.js]
 skip-if = toolkit == "windows" # Disabled on Windows due to frequent failures (bug 969405)
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_menuButtonFitts.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_middleMouse_noJSPaste.js]
 subsuite = clipboard
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
rename from browser/base/content/test/general/POSTSearchEngine.xml
rename to browser/components/urlbar/tests/browser/POSTSearchEngine.xml
--- a/browser/components/urlbar/tests/browser/browser.ini
+++ b/browser/components/urlbar/tests/browser/browser.ini
@@ -34,17 +34,23 @@ skip-if = os != "mac" # Mac only feature
 support-files =
   searchSuggestionEngine.xml
   searchSuggestionEngine.sjs
 [browser_caret_navigation.js]
 [browser_dragdropURL.js]
 [browser_dropmarker.js]
 [browser_ime_composition.js]
 [browser_keepStateAcrossTabSwitches.js]
+[browser_keywordBookmarklets.js]
 [browser_keyword_override.js]
+[browser_keywordSearch.js]
+[browser_keywordSearch_postData.js]
+uses-unsafe-cpows = true
+support-files =
+  POSTSearchEngine.xml
 [browser_keyword_select_and_type.js]
 [browser_keyword.js]
 support-files =
   print_postdata.sjs
   searchSuggestionEngine.xml
   searchSuggestionEngine.sjs
 [browser_locationBarCommand.js]
 [browser_locationBarExternalLoad.js]
rename from browser/base/content/test/general/browser_keywordBookmarklets.js
rename to browser/components/urlbar/tests/browser/browser_keywordBookmarklets.js
rename from browser/base/content/test/general/browser_keywordSearch.js
rename to browser/components/urlbar/tests/browser/browser_keywordSearch.js
rename from browser/base/content/test/general/browser_keywordSearch_postData.js
rename to browser/components/urlbar/tests/browser/browser_keywordSearch_postData.js
--- a/browser/base/content/test/general/browser_keywordSearch_postData.js
+++ b/browser/components/urlbar/tests/browser/browser_keywordSearch_postData.js
@@ -16,17 +16,17 @@ var gTests = [
   },
 ];
 
 add_task(async function setup() {
   let engineAddedPromise = TestUtils.topicObserved("browser-search-engine-modified", (subject, data) => {
     return data == "engine-added";
   });
 
-  const url = "http://test:80/browser/browser/base/content/test/general/POSTSearchEngine.xml";
+  const url = "http://test:80/browser/browser/components/urlbar/tests/browser/POSTSearchEngine.xml";
   await Services.search.addEngine(url, null, false);
 
   let [subject, data] = await engineAddedPromise;
 
   let engine = subject.QueryInterface(Ci.nsISearchEngine);
   info("Observer: " + data + " for " + engine.name);
 
   if (engine.name != "POST Search") {
--- a/browser/components/urlbar/tests/legacy/browser.ini
+++ b/browser/components/urlbar/tests/legacy/browser.ini
@@ -50,18 +50,24 @@ skip-if = os != "mac" # Mac only feature
 [../browser/browser_autoFill_backspaced.js]
 [../browser/browser_autoFill_canonize.js]
 [../browser/browser_autoFill_preserve.js]
 [../browser/browser_autoFill_trimURLs.js]
 [../browser/browser_autocomplete_tag_star_visibility.js]
 [../browser/browser_canonizeURL.js]
 [../browser/browser_dragdropURL.js]
 [../browser/browser_ime_composition.js]
+[../browser/browser_keywordBookmarklets.js]
 [../browser/browser_keepStateAcrossTabSwitches.js]
 [../browser/browser_keyword_override.js]
+[../browser/browser_keywordSearch.js]
+[../browser/browser_keywordSearch_postData.js]
+uses-unsafe-cpows = true
+support-files =
+  ../browser/POSTSearchEngine.xml
 [../browser/browser_keyword_select_and_type.js]
 [../browser/browser_keyword.js]
 support-files =
   ../browser/print_postdata.sjs
 [../browser/browser_URLBarSetURI.js]
 skip-if = (os == "linux" || os == "mac") && debug # bug 970052, bug 970053
 [../browser/browser_locationBarCommand.js]
 [../browser/browser_locationBarExternalLoad.js]