Bug 1342178 - Rename test_network_security-hpkp.html. r=Honza,keeler
☠☠ backed out by 167230c49025 ☠ ☠
authorJonathan Hao <jhao@mozilla.com>
Thu, 06 Apr 2017 15:43:32 +0800
changeset 560213 4afce44bc2b9f0793d81e868dafc73ffd0ddd3be
parent 560212 db9b64a440120c4e259397b203cf11f82c6f1859
child 560214 f19289f0cfefc116efeb99cf02164c41238d2353
push id53365
push userjichen@mozilla.com
push dateTue, 11 Apr 2017 08:35:12 +0000
reviewersHonza, keeler
bugs1342178
milestone55.0a1
Bug 1342178 - Rename test_network_security-hpkp.html. r=Honza,keeler MozReview-Commit-ID: I82vZXxJgTI
devtools/shared/webconsole/test/chrome.ini
devtools/shared/webconsole/test/test_network_security-hpkp.html
devtools/shared/webconsole/test/test_network_security-hsts.html
devtools/shared/webconsole/test/test_network_security.html
--- a/devtools/shared/webconsole/test/chrome.ini
+++ b/devtools/shared/webconsole/test/chrome.ini
@@ -27,16 +27,15 @@ support-files =
 [test_jsterm.html]
 [test_jsterm_autocomplete.html]
 [test_jsterm_cd_iframe.html]
 [test_jsterm_last_result.html]
 [test_jsterm_queryselector.html]
 [test_network_get.html]
 [test_network_longstring.html]
 [test_network_post.html]
-[test_network_security-hpkp.html]
-[test_network_security-hsts.html]
+[test_network_security.html]
 [test_nsiconsolemessage.html]
 [test_object_actor.html]
 [test_object_actor_native_getters.html]
 [test_object_actor_native_getters_lenient_this.html]
 [test_page_errors.html]
 [test_throw.html]
deleted file mode 100644
--- a/devtools/shared/webconsole/test/test_network_security-hsts.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-  <meta charset="utf8">
-  <title>Test for the network actor (HSTS detection)</title>
-  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="common.js"></script>
-  <!-- Any copyright is dedicated to the Public Domain.
-     - http://creativecommons.org/publicdomain/zero/1.0/ -->
-</head>
-<body>
-<p>Test for the network actor (HSTS detection)</p>
-
-<iframe src="https://example.com/chrome/devtools/shared/webconsole/test/network_requests_iframe.html"></iframe>
-
-<script class="testbody" type="text/javascript">
-SimpleTest.waitForExplicitFinish();
-
-let gCurrentTestCase = -1;
-const TEST_CASES = [
-  {
-    desc: "no HSTS",
-    url: "https://example.com",
-    usesHSTS: false,
-  },
-  {
-    desc: "HSTS from this response",
-    url: "https://example.com/"+
-         "browser/browser/base/content/test/general/browser_star_hsts.sjs",
-    usesHSTS: true,
-  },
-  {
-    desc: "stored HSTS from previous response",
-    url: "https://example.com/",
-    usesHSTS: true,
-  }
-];
-
-function startTest()
-{
-
-  SimpleTest.registerCleanupFunction(() => {
-    // Reset HSTS state.
-    let gSSService = Cc["@mozilla.org/ssservice;1"]
-                       .getService(Ci.nsISiteSecurityService);
-
-    let gIOService = Cc["@mozilla.org/network/io-service;1"]
-                       .getService(Ci.nsIIOService);
-
-    let uri = gIOService.newURI(TEST_CASES[0].url);
-    gSSService.removeState(Ci.nsISiteSecurityService.HEADER_HSTS, uri, 0);
-  });
-
-  info("Test detection of HTTP Strict Transport Security.");
-  removeEventListener("load", startTest);
-  attachConsoleToTab(["NetworkActivity"], onAttach);
-}
-
-function onAttach(aState, aResponse)
-{
-  onNetworkEventUpdate = onNetworkEventUpdate.bind(null, aState);
-  aState.dbgClient.addListener("networkEventUpdate", onNetworkEventUpdate);
-
-  runNextCase(aState);
-}
-
-function runNextCase(aState) {
-  gCurrentTestCase++;
-  if (gCurrentTestCase === TEST_CASES.length) {
-    info("Tests ran. Cleaning up.");
-    closeDebugger(aState, SimpleTest.finish);
-    return;
-  }
-
-  let { desc, url } = TEST_CASES[gCurrentTestCase];
-  info("Testing site with " + desc);
-
-  let iframe = document.querySelector("iframe").contentWindow;
-  iframe.wrappedJSObject.makeXhrCallback("GET", url);
-}
-
-function onNetworkEventUpdate(aState, aType, aPacket)
-{
-  function onSecurityInfo(packet) {
-    let data = TEST_CASES[gCurrentTestCase];
-    is(packet.securityInfo.hsts, data.usesHSTS,
-      "Strict Transport Security detected correctly.");
-
-    runNextCase(aState);
-  }
-
-  if (aPacket.updateType === "securityInfo") {
-    aState.client.getSecurityInfo(aPacket.from, onSecurityInfo);
-  }
-}
-
-addEventListener("load", startTest);
-</script>
-</body>
-</html>
rename from devtools/shared/webconsole/test/test_network_security-hpkp.html
rename to devtools/shared/webconsole/test/test_network_security.html