diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /toolkit/mozapps/extensions/test/mochitest/test_bug887098.html | |
parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
download | UXP-fc61780b35af913801d72086456f493f63197da6.tar UXP-fc61780b35af913801d72086456f493f63197da6.tar.gz UXP-fc61780b35af913801d72086456f493f63197da6.tar.lz UXP-fc61780b35af913801d72086456f493f63197da6.tar.xz UXP-fc61780b35af913801d72086456f493f63197da6.zip |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'toolkit/mozapps/extensions/test/mochitest/test_bug887098.html')
-rw-r--r-- | toolkit/mozapps/extensions/test/mochitest/test_bug887098.html | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/toolkit/mozapps/extensions/test/mochitest/test_bug887098.html b/toolkit/mozapps/extensions/test/mochitest/test_bug887098.html deleted file mode 100644 index 2b2033a37..000000000 --- a/toolkit/mozapps/extensions/test/mochitest/test_bug887098.html +++ /dev/null @@ -1,51 +0,0 @@ -<!DOCTYPE HTML> -<html> -<!-- -https://bugzilla.mozilla.org/show_bug.cgi?id=887098 ---> -<head> - <meta charset="utf-8"> - <title>Test for Bug 887098</title> - <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> - <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> - <script type="application/javascript"> - - /** Test for Bug 887098 **/ - SimpleTest.waitForExplicitFinish(); - - function loaded() { - var iwin = $('ifr').contentWindow; - var href = SpecialPowers.wrap(iwin).location.href; - if (/file_empty/.test(href)) { - window.evalRef = iwin.eval; - window.installTriggerRef = iwin.InstallTrigger; // Force lazy instantiation. - // about: is privileged, so we need to be privileged to load it. - SpecialPowers.wrap(iwin).location.href = 'about:'; - } else { - is(href, 'about:', "Successfully navigated to about:"); - try { - evalRef('InstallTrigger.install({URL: "chrome://global/skin/global.css"});'); - ok(false, "Should have thrown when trying to install restricted URI from InstallTrigger"); - } catch (e) { - //XXXgijs this test broke because of the switch to webidl. I'm told - // it has to do with compartments and the fact that we eval in "about:". - // Tracking in bug 1007671 - todo(/permission/.test(e), "We should throw a security exception. Got: " + e); - } - SimpleTest.finish(); - } - } - - </script> -</head> -<body> -<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=887098">Mozilla Bug 887098</a> -<p id="display"></p> -<div id="content" style="display: none"> - -</div> -<iframe onload="loaded();" id="ifr" src="file_empty.html"></iframe> -<pre id="test"> -</pre> -</body> -</html> |