Backed out changeset a3bbf490ea41 (bug 1419109) for browser-chrome failures at browser/test-oop-extensions/browser_ext_browserAction_pageAction_icon_permissions.js
authorCoroiu Cristina <ccoroiu@mozilla.com>
Sun, 13 Jan 2019 18:51:03 +0200
changeset 453679 2bb5deb58950
parent 453678 a3bbf490ea41
child 453680 63b0062fba03
child 453696 1114f74deed5
push id111122
push useraciure@mozilla.com
push dateSun, 13 Jan 2019 21:39:49 +0000
treeherdermozilla-inbound@4df878f3d037 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1419109
milestone66.0a1
backs outa3bbf490ea41
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
Backed out changeset a3bbf490ea41 (bug 1419109) for browser-chrome failures at browser/test-oop-extensions/browser_ext_browserAction_pageAction_icon_permissions.js
toolkit/components/extensions/schemas/manifest.json
toolkit/components/extensions/test/xpcshell/test_ext_manifest.js
toolkit/components/extensions/test/xpcshell/xpcshell.ini
--- a/toolkit/components/extensions/schemas/manifest.json
+++ b/toolkit/components/extensions/schemas/manifest.json
@@ -402,22 +402,16 @@
         "pattern": "^https?://.*$"
       },
       {
         "id": "ExtensionURL",
         "type": "string",
         "format": "strictRelativeUrl"
       },
       {
-        "id": "ExtensionFileUrl",
-        "type": "string",
-        "format": "strictRelativeUrl",
-        "pattern": "^\\w"
-      },
-      {
         "id": "ImageDataOrExtensionURL",
         "type": "string",
         "format": "imageDataOrStrictRelativeUrl"
       },
       {
         "id": "ExtensionID",
         "choices": [
           {
@@ -546,21 +540,21 @@
         }
       },
       {
         "id": "IconPath",
         "choices": [
           {
             "type": "object",
             "patternProperties": {
-              "^[1-9]\\d*$": { "$ref": "ExtensionFileUrl" }
+              "^[1-9]\\d*$": { "$ref": "ExtensionURL" }
             },
             "additionalProperties": false
           },
-          { "$ref": "ExtensionFileUrl" }
+          { "$ref": "ExtensionURL" }
         ]
       },
       {
         "id": "IconImageData",
         "choices": [
           {
             "type": "object",
             "patternProperties": {
deleted file mode 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_manifest.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set sts=2 sw=2 et tw=80: */
-"use strict";
-
-add_task(async function test_manifest() {
-  let normalized = await ExtensionTestUtils.normalizeManifest({
-    "browser_action": {
-      "default_icon": "",
-    },
-  });
-
-  equal(normalized.error,
-        `Error processing browser_action.default_icon: Value "" must either: be an object value, or match the pattern /^\\w/`,
-        "Should have an error");
-  Assert.deepEqual(normalized.errors, [], "Should not have a warning");
-
-  normalized = await ExtensionTestUtils.normalizeManifest({
-    "browser_action": {
-      "default_icon": {
-        "16": "",
-      },
-    },
-  });
-
-  equal(normalized.error,
-        "Error processing browser_action.default_icon: Value must either: .16 must match the pattern /^\\w/, or be a string value",
-        "Should have an error");
-  Assert.deepEqual(normalized.errors, [], "Should not have a warning");
-
-  normalized = await ExtensionTestUtils.normalizeManifest({
-    "browser_action": {
-      "default_icon": {
-        "16": "icon.png",
-      },
-    },
-  });
-
-  equal(normalized.error, undefined, "Should not have an error");
-  Assert.deepEqual(normalized.errors, [], "Should not have a warning");
-
-  normalized = await ExtensionTestUtils.normalizeManifest({
-    "browser_action": {
-      "default_icon": "icon.png",
-    },
-  });
-
-  equal(normalized.error, undefined, "Should not have an error");
-  Assert.deepEqual(normalized.errors, [], "Should not have a warning");
-});
--- a/toolkit/components/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/components/extensions/test/xpcshell/xpcshell.ini
@@ -28,17 +28,16 @@ tags = webextensions in-process-webexten
 [test_MatchPattern.js]
 [test_WebExtensionContentScript.js]
 [test_WebExtensionPolicy.js]
 
 [test_csp_custom_policies.js]
 [test_csp_validator.js]
 [test_ext_contexts.js]
 [test_ext_json_parser.js]
-[test_ext_manifest.js]
 [test_ext_manifest_content_security_policy.js]
 [test_ext_manifest_incognito.js]
 [test_ext_manifest_minimum_chrome_version.js]
 [test_ext_manifest_minimum_opera_version.js]
 [test_ext_manifest_themes.js]
 [test_ext_permission_warnings.js]
 [test_ext_schemas.js]
 [test_ext_schemas_roots.js]