Bug 1340586 Part 1 Move webextensions tests to their own directory r=mossop

MozReview-Commit-ID: JaCyAVYgjL6

--HG--
rename : browser/base/content/test/general/browser_extension_permissions.js => browser/base/content/test/webextensions/browser_extension_permissions.js
rename : browser/base/content/test/general/browser_extension_sideloading.js => browser/base/content/test/webextensions/browser_extension_sideloading.js
rename : browser/base/content/test/general/browser_extension_update_background.js => browser/base/content/test/webextensions/browser_extension_update_background.js
rename : browser/base/content/test/general/browser_extension_update_interactive.js => browser/base/content/test/webextensions/browser_extension_update_interactive.js
rename : browser/base/content/test/general/browser_legacy.xpi => browser/base/content/test/webextensions/browser_legacy.xpi
rename : browser/base/content/test/general/browser_legacy_webext.xpi => browser/base/content/test/webextensions/browser_legacy_webext.xpi
rename : browser/base/content/test/general/browser_webext_nopermissions.xpi => browser/base/content/test/webextensions/browser_webext_nopermissions.xpi
rename : browser/base/content/test/general/browser_webext_permissions.xpi => browser/base/content/test/webextensions/browser_webext_permissions.xpi
rename : browser/base/content/test/general/browser_webext_search.xml => browser/base/content/test/webextensions/browser_webext_search.xml
rename : browser/base/content/test/general/browser_webext_update.json => browser/base/content/test/webextensions/browser_webext_update.json
rename : browser/base/content/test/general/browser_webext_update1.xpi => browser/base/content/test/webextensions/browser_webext_update1.xpi
rename : browser/base/content/test/general/browser_webext_update2.xpi => browser/base/content/test/webextensions/browser_webext_update2.xpi
rename : browser/base/content/test/general/browser_webext_update_icon1.xpi => browser/base/content/test/webextensions/browser_webext_update_icon1.xpi
rename : browser/base/content/test/general/browser_webext_update_icon2.xpi => browser/base/content/test/webextensions/browser_webext_update_icon2.xpi
rename : browser/base/content/test/general/browser_webext_update_perms1.xpi => browser/base/content/test/webextensions/browser_webext_update_perms1.xpi
rename : browser/base/content/test/general/browser_webext_update_perms2.xpi => browser/base/content/test/webextensions/browser_webext_update_perms2.xpi
rename : browser/base/content/test/general/file_install_extensions.html => browser/base/content/test/webextensions/file_install_extensions.html
extra : rebase_source : c9cbd1d914f0120e913ebcf0977df8a9e00744dd

browser/base/content/test/general/browser.ini

@@ -74,19 +74,6 @@ support-files =
   web_video1.ogv
   web_video1.ogv^headers^
   zoom_test.html
-  file_install_extensions.html
-  browser_legacy.xpi
-  browser_legacy_webext.xpi
-  browser_webext_permissions.xpi
-  browser_webext_nopermissions.xpi
-  browser_webext_update1.xpi
-  browser_webext_update2.xpi
-  browser_webext_update_icon1.xpi
-  browser_webext_update_icon2.xpi
-  browser_webext_update_perms1.xpi
-  browser_webext_update_perms2.xpi
-  browser_webext_update.json
-  browser_webext_search.xml
   !/image/test/mochitest/blue.png
   !/toolkit/content/tests/browser/common/mockTransfer.js
   !/toolkit/modules/tests/browser/metadata_*.html
@@ -256,10 +243,6 @@ skip-if = os == "mac" # decoder doctor isn't implemented on osx
 [browser_duplicateIDs.js]
 [browser_drag.js]
 skip-if = true # browser_drag.js is disabled, as it needs to be updated for the new behavior from bug 320638.
-[browser_extension_permissions.js]
-[browser_extension_sideloading.js]
-[browser_extension_update_background.js]
-[browser_extension_update_interactive.js]
 [browser_favicon_change.js]
 [browser_favicon_change_not_in_document.js]
 [browser_findbarClose.js]

browser/base/content/test/webextensions/browser.ini

@@ -0,0 +1,20 @@
+[DEFAULT]
+support-files =
+  file_install_extensions.html
+  browser_legacy.xpi
+  browser_legacy_webext.xpi
+  browser_webext_permissions.xpi
+  browser_webext_nopermissions.xpi
+  browser_webext_update1.xpi
+  browser_webext_update2.xpi
+  browser_webext_update_icon1.xpi
+  browser_webext_update_icon2.xpi
+  browser_webext_update_perms1.xpi
+  browser_webext_update_perms2.xpi
+  browser_webext_update.json
+  browser_webext_search.xml
+
+[browser_extension_permissions.js]
+[browser_extension_sideloading.js]
+[browser_extension_update_background.js]
+[browser_extension_update_interactive.js]

browser/base/content/test/webextensions/browser_extension_update_interactive.js

@@ -1,6 +1,6 @@
 const {AddonManagerPrivate} = Cu.import("resource://gre/modules/AddonManager.jsm", {});
 
-const URL_BASE = "https://example.com/browser/browser/base/content/test/general";
+const URL_BASE = "https://example.com/browser/browser/base/content/test/webextensions";
 const ID = "update2@tests.mozilla.org";
 const ID_LEGACY = "legacy_update@tests.mozilla.org";
 

browser/base/content/test/webextensions/browser_webext_search.xml

@@ -21,7 +21,7 @@
       </application>
     </compatible_applications>
     <compatible_os>ALL</compatible_os>
-    <install size="1">https://example.com/browser/browser/base/content/test/general/browser_webext_permissions.xpi</install>
+    <install size="1">https://example.com/browser/browser/base/content/test/webextensions/browser_webext_permissions.xpi</install>
   </addon>
 
   <addon>
@@ -45,7 +45,7 @@
       </application>
     </compatible_applications>
     <compatible_os>ALL</compatible_os>
-    <install size="1">https://example.com/browser/browser/base/content/test/general/browser_webext_nopermissions.xpi</install>
+    <install size="1">https://example.com/browser/browser/base/content/test/webextensions/browser_webext_nopermissions.xpi</install>
   </addon>
 </searchresults>
 

browser/base/content/test/webextensions/browser_webext_update.json

@@ -4,7 +4,7 @@
       "updates": [
         {
           "version": "2.0",
-          "update_link": "https://example.com/browser/browser/base/content/test/general/browser_webext_update2.xpi",
+          "update_link": "https://example.com/browser/browser/base/content/test/webextensions/browser_webext_update2.xpi",
           "applications": {
             "gecko": {
               "strict_min_version": "1",
@@ -18,7 +18,7 @@
       "updates": [
         {
           "version": "2.0",
-          "update_link": "https://example.com/browser/browser/base/content/test/general/browser_webext_update_icon2.xpi",
+          "update_link": "https://example.com/browser/browser/base/content/test/webextensions/browser_webext_update_icon2.xpi",
           "applications": {
             "gecko": {
               "strict_min_version": "1",
@@ -32,7 +32,7 @@
       "updates": [
         {
           "version": "2.0",
-          "update_link": "https://example.com/browser/browser/base/content/test/general/browser_webext_update_perms2.xpi",
+          "update_link": "https://example.com/browser/browser/base/content/test/webextensions/browser_webext_update_perms2.xpi",
           "applications": {
             "gecko": {
               "strict_min_version": "1",
@@ -46,7 +46,7 @@
       "updates": [
         {
           "version": "2.0",
-          "update_link": "https://example.com/browser/browser/base/content/test/general/browser_legacy_webext.xpi",
+          "update_link": "https://example.com/browser/browser/base/content/test/webextensions/browser_legacy_webext.xpi",
           "applications": {
             "gecko": {
               "strict_min_version": "1",

browser/base/moz.build

@@ -28,6 +28,7 @@ BROWSER_CHROME_MANIFESTS += [
     'content/test/tabPrompts/browser.ini',
     'content/test/tabs/browser.ini',
     'content/test/urlbar/browser.ini',
+    'content/test/webextensions/browser.ini',
     'content/test/webrtc/browser.ini',
 ]