Backed out 3 changesets (bug 1450538) for failing browser_show_statuspanel_idn.js. a=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 19 Apr 2018 20:44:27 +0300
changeset 463393 f453337749a3fd288e5591e804c9fdb24fe41afd
parent 463392 856a4e5b3748bcf170b5e5cbd301728f7f7be638
child 463394 b5df4e9b4c08d1e753dd90fa9961765d8e38b6d2
push id1683
push usersfraser@mozilla.com
push dateThu, 26 Apr 2018 16:43:40 +0000
treeherdermozilla-release@5af6cb21869d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1450538
milestone60.0
backs oute6cdf63c59a494a79197fcefca78a83399244a8e
fd3897b47e12f5a392f83914e0fbf9a2b8216366
8b59be7c1ce63c7d70b53a8fd76f019c9a63ea6e
Backed out 3 changesets (bug 1450538) for failing browser_show_statuspanel_idn.js. a=backout Backed out changeset e6cdf63c59a4 (bug 1450538) Backed out changeset fd3897b47e12 (bug 1450538) Backed out changeset 8b59be7c1ce6 (bug 1450538)
browser/base/content/.eslintrc.js
browser/base/content/moz.build
browser/base/content/test/statuspanel/browser.ini
browser/base/content/test/statuspanel/browser_show_statuspanel_idn.js
browser/base/content/test/statuspanel/head.js
browser/base/moz.build
docshell/base/nsDocShell.cpp
deleted file mode 100644
--- a/browser/base/content/.eslintrc.js
+++ /dev/null
@@ -1,8 +0,0 @@
-"use strict";
-
-module.exports = {
-  "extends": [
-    "plugin:mozilla/browser-test"
-  ]
-};
-
--- a/browser/base/content/moz.build
+++ b/browser/base/content/moz.build
@@ -66,19 +66,16 @@ with Files("test/siteIdentity/**"):
     BUG_COMPONENT = ("Firefox", "Site Identity and Permission Panels")
 
 with Files("test/sidebar/**"):
     BUG_COMPONENT = ("Firefox", "General")
 
 with Files("test/static/**"):
     BUG_COMPONENT = ("Firefox", "General")
 
-with Files("test/statuspanel/**"):
-    BUG_COMPONENT = ("Firefox", "Tabbed Browser")
-
 with Files("test/sync/**"):
     BUG_COMPONENT = ("Firefox", "Sync")
 
 with Files("test/tabPrompts/**"):
     BUG_COMPONENT = ("Firefox", "Tabbed Browser")
 
 with Files("test/tabcrashed/**"):
     BUG_COMPONENT = ("Firefox", "Tabbed Browser")
deleted file mode 100644
--- a/browser/base/content/test/statuspanel/browser.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[DEFAULT]
-support-files =
-  head.js
-
-[browser_show_statuspanel_idn.js]
-skip-if = webrender && verify
deleted file mode 100644
--- a/browser/base/content/test/statuspanel/browser_show_statuspanel_idn.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-const TEST_PAGE_URL = encodeURI(`data:text/html;charset=utf-8,<a id="foo" href="http://nic.xn--rhqv96g/">abc</a><span id="bar">def</span>`);
-const TEST_STATUS_TEXT = "nic.\u4E16\u754C";
-
-/**
- * Test that if the StatusPanel displays an IDN
- * (Bug 1450538).
- */
-add_task(async function test_show_statuspanel_twice() {
-  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, TEST_PAGE_URL);
-
-  let promise = promiseStatusPanelShown(window, TEST_STATUS_TEXT);
-  ContentTask.spawn(tab.linkedBrowser, null, async () => {
-    content.document.links[0].focus();
-  });
-  await promise;
-
-  await BrowserTestUtils.removeTab(tab);
-});
deleted file mode 100644
--- a/browser/base/content/test/statuspanel/head.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Returns a Promise that resolves when a StatusPanel for a
- * window has finished being shown. Also asserts that the
- * text content of the StatusPanel matches a value.
- *
- * @param win (browser window)
- *        The window that the StatusPanel belongs to.
- * @param value (string)
- *        The value that the StatusPanel should show.
- * @returns Promise
- */
-async function promiseStatusPanelShown(win, value) {
-  let panel = win.StatusPanel.panel;
-  await BrowserTestUtils.waitForEvent(panel, "transitionend", (e) => {
-    return e.propertyName === "opacity" &&
-           win.getComputedStyle(e.target).opacity == "1";
-  });
-
-  Assert.equal(win.StatusPanel._labelElement.value, value);
-}
-
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -38,17 +38,16 @@ BROWSER_CHROME_MANIFESTS += [
     'content/test/plugins/browser.ini',
     'content/test/popupNotifications/browser.ini',
     'content/test/popups/browser.ini',
     'content/test/referrer/browser.ini',
     'content/test/sanitize/browser.ini',
     'content/test/sidebar/browser.ini',
     'content/test/siteIdentity/browser.ini',
     'content/test/static/browser.ini',
-    'content/test/statuspanel/browser.ini',
     'content/test/sync/browser.ini',
     'content/test/tabcrashed/browser.ini',
     'content/test/tabPrompts/browser.ini',
     'content/test/tabs/browser.ini',
     'content/test/touch/browser.ini',
     'content/test/urlbar/browser.ini',
     'content/test/webextensions/browser.ini',
     'content/test/webrtc/browser.ini',
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -13811,17 +13811,17 @@ nsDocShell::OnOverLink(nsIContent* aCont
   if (!browserChrome2) {
     browserChrome = do_GetInterface(mTreeOwner);
     if (!browserChrome) {
       return rv;
     }
   }
 
   nsAutoCString spec;
-  rv = aURI->GetDisplaySpec(spec);
+  rv = aURI->GetSpec(spec);
   NS_ENSURE_SUCCESS(rv, rv);
 
   NS_ConvertUTF8toUTF16 uStr(spec);
 
   mozilla::net::PredictorPredict(aURI, mCurrentURI,
                                  nsINetworkPredictor::PREDICT_LINK,
                                  aContent->NodePrincipal()->OriginAttributesRef(),
                                  nullptr);