1 files changed, 35 insertions, 0 deletions
diff --git a/browser/base/content/test/favicons/browser_bug550565.js b/browser/base/content/test/favicons/browser_bug550565.js
new file mode 100644
index 0000000000..32a7527bbf
--- /dev/null
+++ b/browser/base/content/test/favicons/browser_bug550565.js
@@ -0,0 +1,35 @@
+add_task(async function test() {
+  let testPath = getRootDirectory(gTestPath);
+
+  await BrowserTestUtils.withNewTab(
+    { gBrowser, url: "about:blank" },
+    async function (tabBrowser) {
+      const URI = testPath + "file_with_favicon.html";
+      const expectedIcon = testPath + "file_generic_favicon.ico";
+      let faviconPromise = waitForLinkAvailable(tabBrowser);
+
+      BrowserTestUtils.loadURIString(tabBrowser, URI);
+
+      let iconURI = await faviconPromise;
+      is(iconURI, expectedIcon, "Correct icon before pushState.");
+
+      faviconPromise = waitForLinkAvailable(tabBrowser);
+
+      await SpecialPowers.spawn(tabBrowser, [], function () {
+        content.history.pushState("page2", "page2", "page2");
+      });
+
+      // We've navigated and shouldn't get a call to onLinkIconAvailable.
+      TestUtils.executeSoon(() => {
+        faviconPromise.cancel();
+      });
+
+      try {
+        await faviconPromise;
+        ok(false, "Should not have seen a new icon load.");
+      } catch (e) {
+        ok(true, "Should have been able to cancel the promise.");
+      }
+    }
+  );
+});