Adding upstream version 1:115.7.0.upstream/1%115.7.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 49 insertions, 0 deletions

diff --git a/toolkit/components/search/tests/xpcshell/test_opensearch_icons_invalid.js b/toolkit/components/search/tests/xpcshell/test_opensearch_icons_invalid.js
new file mode 100644
index 0000000000..4f81b0e9d3
--- /dev/null
+++ b/toolkit/components/search/tests/xpcshell/test_opensearch_icons_invalid.js
@@ -0,0 +1,49 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/* Test that an installed engine can't use a resource URL for an icon */
+
+"use strict";
+
+add_task(async function setup() {
+  let server = useHttpServer("");
+  server.registerContentType("sjs", "sjs");
+  await AddonTestUtils.promiseStartupManager();
+});
+
+add_task(async function test_installedresourceicon() {
+  let engine1 = await SearchTestUtils.promiseNewSearchEngine({
+    url: `${gDataUrl}opensearch/resourceicon.xml`,
+  });
+  let engine2 = await SearchTestUtils.promiseNewSearchEngine({
+    url: `${gDataUrl}opensearch/chromeicon.xml`,
+  });
+
+  Assert.equal(null, engine1.iconURI);
+  Assert.equal(null, engine2.iconURI);
+});
+
+add_task(async function test_installedhttpplace() {
+  let observed = TestUtils.consoleMessageObserved(msg => {
+    return msg.wrappedJSObject.arguments[0].includes(
+      "Content type does not match expected"
+    );
+  });
+
+  // The easiest way to test adding the icon is via a generated xml, otherwise
+  // we have to somehow insert the address of the server into it.
+  let engine = await SearchTestUtils.promiseNewSearchEngine({
+    url:
+      `${gDataUrl}data/engineMaker.sjs?` +
+      JSON.stringify({
+        baseURL: gDataUrl,
+        image: "opensearch/resourceicon.xml",
+        name: "invalidicon",
+        method: "GET",
+      }),
+  });
+
+  await observed;
+
+  Assert.equal(null, engine.iconURI, "Should not have set an iconURI");
+});